From 1a437b984a28cf11fd66aea09cf7bcdbacdb7a37 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Thu, 19 Jan 2017 13:27:55 -0500
Subject: [PATCH] parse options before downloading nwjs binary (since some of
the nwjs binary prep depends on whether we're building a dmg)
---
l2ork_addons/tar_em_up.sh | 101 +++++++++++++++++++-------------------
1 file changed, 50 insertions(+), 51 deletions(-)
diff --git a/l2ork_addons/tar_em_up.sh b/l2ork_addons/tar_em_up.sh
index e42adcf09..730c68a95 100755
--- a/l2ork_addons/tar_em_up.sh
+++ b/l2ork_addons/tar_em_up.sh
@@ -40,6 +40,56 @@ pkg=1
inno=0
dmg=0
+while getopts ":abBcdefFnRruwXzZ" Option
+do case $Option in
+ a) addon=1;;
+
+ b) deb=1
+ inst_dir=${inst_dir:-/usr};;
+
+ B) deb=2
+ inst_dir=${inst_dir:-/usr};;
+
+ c) core=1;;
+
+ e) addon=1
+ core=1
+ full=1;;
+
+ f) full=1;;
+
+ F) full=2;;
+
+ n) pkg=0;;
+
+ R) deb=2
+ inst_dir=/usr
+ rpi=1;;
+
+ r) deb=1
+ inst_dir=/usr
+ rpi=1;;
+
+ w) sys_cwiid=1
+ ;;
+
+ X) dmg=1
+ inst_dir=/usr;;
+
+ z) inno=1
+ inst_dir=/usr;;
+
+ Z) inno=2
+ inst_dir=/usr;;
+
+ *) echo "Error: unknown option";;
+ esac
+done
+
+inst_dir=${inst_dir:-/usr/local}
+
+export TAR_EM_UP_PREFIX=$inst_dir
+
# Get the OS we're running under, normalized to names that can be used
# to fetch the nwjs binaries below
@@ -121,57 +171,6 @@ if [[ $os == "win" ]]; then
fi
fi
-
-while getopts ":abBcdefFnRruwXzZ" Option
-do case $Option in
- a) addon=1;;
-
- b) deb=1
- inst_dir=${inst_dir:-/usr};;
-
- B) deb=2
- inst_dir=${inst_dir:-/usr};;
-
- c) core=1;;
-
- e) addon=1
- core=1
- full=1;;
-
- f) full=1;;
-
- F) full=2;;
-
- n) pkg=0;;
-
- R) deb=2
- inst_dir=/usr
- rpi=1;;
-
- r) deb=1
- inst_dir=/usr
- rpi=1;;
-
- w) sys_cwiid=1
- ;;
-
- X) dmg=1
- inst_dir=/usr;;
-
- z) inno=1
- inst_dir=/usr;;
-
- Z) inno=2
- inst_dir=/usr;;
-
- *) echo "Error: unknown option";;
- esac
-done
-
-inst_dir=${inst_dir:-/usr/local}
-
-export TAR_EM_UP_PREFIX=$inst_dir
-
cd ../
if [ $core -eq 1 ]
--
GitLab