diff --git a/7.2-install.txt b/7.2-install.txt index 212e1f2c..17972e36 100644 --- a/7.2-install.txt +++ b/7.2-install.txt @@ -1,11 +1,11 @@ #!/bin/bash # Copied from: https://github.com/iiab/iiab-factory/blob/master/install.txt - +# Copied https://github.com/jvonau/iiab-factory/iiab-upgrade/7.2-install.txt # To install Internet-in-a-Box (IIAB) 7.2 / pre-release onto Raspberry Pi OS, # Ubuntu 20.04 or Debian 10, run this 1-line installer: # # curl d.iiab.io/install.txt | sudo bash - +#curl https://raw.githubusercontent.com/jvonau/iiab-factory/iiab-upgrade/7.2-install.txt | sudo bash # 1. WARNING: NOOBS IS *NOT* SUPPORTED, as its partitioning is very different. # On a Raspberry Pi, WE RECOMMEND YOU INSTALL THE LATEST RASPBERRY PI OS: # https://www.raspberrypi.org/documentation/installation/installing-images/README.md @@ -82,6 +82,10 @@ if [ -d iiab-factory ]; then git pull git branch -D $BRANCH &> /dev/null || true git checkout -b $BRANCH + # testing + git branch -D iiab-upgrade &> /dev/null || true + git checkout -b iiab-upgrade + git pull https://github.com/jvonau/iiab-factory.git iiab-upgrade cp --remove-destination $BASE/iiab-factory/iiab /usr/sbin/iiab cp --remove-destination $BASE/iiab-factory/iiab-upgrade /usr/sbin/iiab-upgrade else @@ -122,4 +126,4 @@ else fi # Run install script! -/usr/sbin/iiab +/usr/sbin/iiab-upgrade diff --git a/iiab-upgrade b/iiab-upgrade index 17fdd319..e0c8cdd3 100755 --- a/iiab-upgrade +++ b/iiab-upgrade @@ -15,6 +15,8 @@ REINSTALL="" INTERACTIVE=0 UPDATE=0 MASTER=1 +#test="none" +test="iiab-upgrade" MIN_RPI_KERN=1336 SELFUPDATE_SCRIPT="/tmp/.updateScript.sh" # scrape the command line @@ -95,6 +97,10 @@ function update_self() { cd iiab-factory git checkout master git pull + if [ $test != "none" ]; then + git checkout $test + git pull https://github.com/jvonau/iiab-factory.git $test + fi NEW_VERSION=$(grep RELEASE $SCRIPT | awk -F = '{print $2}' | head -n 1) cp $SCRIPT /usr/sbin/$SCRIPT echo "Latest $SCRIPT now installed"