updated

Waziup · Oct 22, 2019 · 25d5aee · 25d5aee
1 parent 5a0d9fb
commit 25d5aee
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/setup/get_waziup.sh b/setup/get_waziup.sh
@@ -30,7 +30,7 @@ sed -i 's/^DEVMODE.*/DEVMODE=0/g' start.sh
 #--------------------------------#
 
 echo "Downloading the docker images..."
-cd $WAZIUP_ROOT/
+cd $WAZIUP_ROOT
 docker-compose pull
 echo "Done"
 

diff --git a/setup/get_waziup.sh~ b/setup/get_waziup.sh~
@@ -3,6 +3,8 @@
 
 WAZIUP_VERSION="V1.0-beta3"
 
+#Setup WAZIUP_ROOT as first argument, with a default value
+WAZIUP_ROOT=${1:-$HOME/waziup-gateway}
 #--------------------------------#
 
 echo "Downloading Wazigate..."

diff --git a/setup/get_waziup_dev.sh b/setup/get_waziup_dev.sh
@@ -10,6 +10,9 @@
 #    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 #fi
 
+#Setup WAZIUP_ROOT as first argument, with a default value
+WAZIUP_ROOT=${1:-$HOME/waziup-gateway}
+
 #--------------------------------#
 
 ./setup/install.sh
@@ -45,6 +48,7 @@ sudo service pure-ftpd restart
 #--------------------------------#
 
 echo "Building the docker images..."
+cd $WAZIUP_ROOT
 sudo docker-compose -f docker-compose.yml -f docker-compose-dev.yml build --force-rm
 
 for i in {10..01}; do

diff --git a/setup/get_waziup_dev.sh~ b/setup/get_waziup_dev.sh~
@@ -10,10 +10,14 @@
 #    [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
 #fi
 
+#Setup WAZIUP_ROOT as first argument, with a default value
+WAZIUP_ROOT=${1:-$HOME/waziup-gateway}
+
 #--------------------------------#
 
-sudo apt-get update
-sudo apt-get install -y git 
+./setup/install.sh
+
+#--------------------------------#
 
 #installing wazigate
 #Using HTTP makes us to clone without needing persmission via ssh-keys
@@ -22,9 +26,6 @@ cd waziup-gateway
 
 #--------------------------------#
 
-./setup/install.sh
-
-#--------------------------------#
 
 sed -i 's/^DEVMODE.*/DEVMODE=1/g' start.sh
 sudo chmod +x start.sh