For idempotency, return to script directory after Git cloning

camvote · Oct 11, 2015 · 4305e32 · 4305e32
1 parent 318299c
commit 4305e32
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/2-install-bob.sh b/2-install-bob.sh
@@ -10,6 +10,7 @@
 if [ ! -d ${installationRoot}/bob ] ; then
 	cd "${installationRoot}"
 	git clone https://github.com/cusu/bob.git
+	cd "${SCRIPTDIRECTORY}"
 fi
 
 # MTA (mail sending)
@@ -45,5 +46,6 @@ zypper -n install -l python
 if [ ! -d ${installationRoot}/openstv ] ; then
 	cd "${installationRoot}"
 	git clone https://github.com/cusu/openstv.git
+	cd "${SCRIPTDIRECTORY}"
 fi
 
diff --git a/3-install-bob-gui-listing.sh b/3-install-bob-gui-listing.sh
@@ -8,8 +8,9 @@
 
 # Add the BOB-GUI software (the native voting component, without any setup management)
 if [ ! -d ${installationRoot}/bob-gui ] ; then
-        cd "${installationRoot}"
-        git clone https://github.com/cusu/bob-gui.git
+	cd "${installationRoot}"
+	git clone https://github.com/cusu/bob-gui.git
+	cd "${SCRIPTDIRECTORY}"
 fi
 
 # Ensure the additionalvotes folder is writable by the webserver