Merge branch 'master' into xp11out

b3nn0 · Jul 24, 2019 · 8eb3c08 · 8eb3c08
2 parents 94824f2 + 72c3aea
commit 8eb3c08
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/image/mk_europe_edition_buster.sh b/image/mk_europe_edition_buster.sh
@@ -9,6 +9,10 @@ BASE_IMAGE_URL="http://director.downloads.raspberrypi.org/raspbian_lite/images/r
 IMGNAME="2019-07-10-raspbian-buster-lite.img"
 TMPDIR="$HOME/stratux-tmp"
 
+if [ "$#" -ne 2 ]; then
+    echo "Usage: " $0 " dev|prod branch"
+    exit 1
+fi
 
 # cd to script directory
 cd "$(dirname "$0")"
@@ -68,14 +72,9 @@ rm go1.12.4.linux-armv6l.tar.gz
 
 if [ "$1" == "dev" ]; then
     cp -ra $SRCDIR .
+    cd stratux && git checkout $2 && cd ..
 else
-    git clone --recursive https://github.com/b3nn0/stratux.git
-    # TODO: remove me
-    #cd stratux
-    #git checkout flarm-nmea
-    #git submodule sync
-    #git submodule update --remote dump1090
-    #cd ..
+    git clone --recursive -b $2 https://github.com/b3nn0/stratux.git
 fi
 cd ../..