From 6044f86160e8b1f4f5dc3c6016fdb063eff2a879 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 15 Sep 2024 19:09:01 +0900 Subject: [PATCH] DEVELOPER_TOOLBOX: added okonomiyaki script [skip ci] --- developer_toolbox/cook_okonomiyaki.sh | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100755 developer_toolbox/cook_okonomiyaki.sh diff --git a/developer_toolbox/cook_okonomiyaki.sh b/developer_toolbox/cook_okonomiyaki.sh new file mode 100755 index 00000000..0f2288bb --- /dev/null +++ b/developer_toolbox/cook_okonomiyaki.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# List of branches to pull and merge +branches=( + "cooker" + "feat/shadps4" + "feat/PortMaster" + "feat/steam-rom-manager" +) + +# Get the current branch name +current_branch=$(git branch --show-current) + +# Check if the current branch contains 'feat/' and 'okonomiyaki' +if [[ $current_branch == feat/* && $current_branch == *okonomiyaki* ]]; then + echo "Current branch is $current_branch, proceeding with fetch, pull, and merge." + + # Iterate through the list of branches + for branch in "${branches[@]}"; do + echo "Fetching $branch..." + git fetch origin $branch + + echo "Pulling $branch..." + git pull origin $branch + + echo "Merging $branch into $current_branch..." + git merge origin/$branch + done +else + echo "Current branch is not an okonomiyaki branch, quitting." + exit 1 +fi