Skip to content

Commit

Permalink
Revert before merging - IIAB using JV sept12-testing
Browse files Browse the repository at this point in the history
  • Loading branch information
jvonau committed Sep 12, 2020
1 parent 8b38023 commit 94a004f
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion iiab-upgrade
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ IIABENV=$CONFDIR/iiab.env
FLAGDIR=$CONFDIR/install-flags
APT_PATH=/usr/bin/apt # Avoids problematic /usr/local/bin/apt on Linux Mint
REINSTALL=""
INTERACTIVE=0
INTERACTIVE=1
UPDATE=0
MASTER=1
#test="none"
Expand Down Expand Up @@ -66,6 +66,11 @@ function update_master(){
echo -e "\nUpdating iiab"
git checkout master
git pull
if [ $test != "none" ]; then
git branch -D $test &> /dev/null || true
git checkout -b $test
git pull https://github.com/jvonau/iiab.git sept12-testing
fi
NEWREV=$(grep iiab_revision vars/default_vars.yml | awk '{print $2}')
fi
cd $BASEDIR
Expand Down

0 comments on commit 94a004f

Please sign in to comment.