From 94a004f08b28d85250ca3776035d21092d253437 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 12 Sep 2020 08:37:51 +0100 Subject: [PATCH] Revert before merging - IIAB using JV sept12-testing --- iiab-upgrade | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/iiab-upgrade b/iiab-upgrade index e0c8cdd3..bdc22109 100755 --- a/iiab-upgrade +++ b/iiab-upgrade @@ -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" @@ -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