steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build.sh: Only pull into current branch so we don't end up merging

master
Doug Coleman 2020-05-16 14:45:33 -05:00
parent abb1755311
commit 75d8607643
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.sh
View File

@ -490,8 +490,9 @@ update_script_name() {
update_script() { update_script() {
local -r update_script=$(update_script_name) local -r update_script=$(update_script_name)
local -r bash_path=$(which bash) local -r bash_path=$(which bash)
$ECHO "updating from ${CURRENT_BRANCH}"
$ECHO "#!$bash_path" >"$update_script" $ECHO "#!$bash_path" >"$update_script"
$ECHO "git pull \"$GIT_URL\" master" >>"$update_script" $ECHO "git pull \"$GIT_URL\" ${CURRENT_BRANCH}" >>"$update_script"
$ECHO "if [[ \$? -eq 0 ]]; then exec \"$0\" $SCRIPT_ARGS; else echo \"git pull failed\"; exit 2; fi" \ $ECHO "if [[ \$? -eq 0 ]]; then exec \"$0\" $SCRIPT_ARGS; else echo \"git pull failed\"; exit 2; fi" \
>>"$update_script" >>"$update_script"
$ECHO "exit 0" >>"$update_script" $ECHO "exit 0" >>"$update_script"
@ -506,18 +507,18 @@ update_script_changed() {
git_fetch() { git_fetch() {
$ECHO "Fetching the git repository from github.com..." $ECHO "Fetching the git repository from github.com..."
branch=$(current_git_branch) set_current_branch
rm -f "$(update_script_name)" rm -f "$(update_script_name)"
$ECHO git fetch "$GIT_URL" "$branch" $ECHO git fetch "$GIT_URL" "${CURRENT_BRANCH}"
invoke_git fetch "$GIT_URL" "$branch" invoke_git fetch "$GIT_URL" "${CURRENT_BRANCH}"
if update_script_changed; then if update_script_changed; then
$ECHO "Updating and restarting the build.sh script..." $ECHO "Updating and restarting the build.sh script..."
update_script update_script
else else
$ECHO "Updating the working tree..." $ECHO "Updating the working tree..."
invoke_git pull "$GIT_URL" master invoke_git pull "$GIT_URL" "${CURRENT_BRANCH}"
fi fi
} }