Merge pull request #244 from Contribution-Tracking/shell

Refactor shell scripts

start-venv.sh

@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
 
-if [ ! -f venv/bin/activate ] ; then
+VENVPATH="venv/bin/activate"
+
+if [ ! -f "$VENVPATH" ]; then
     python3 -m venv venv
 fi
-source venv/bin/activate
+
+source "$VENVPATH"
 python3 -m pip install -r requirements.txt
-python3 zeronet.py $1 $2 $3 $4 $5 $6 $7 $8 $9
+python3 zeronet.py "$@"

termux.sh

@@ -1,12 +1,13 @@
-
+#!/usr/bin/env bash
 # Script for running zeronet-conservancy in Termux on Android
 
-if [[ -d zeronet-conservancy ]]; then
-	cd zeronet-conservancy
-	git pull --ff-only
+REPO_DIR="zeronet-conservancy"
+VENV_SCRIPT="start-venv.sh"
+
+if [[ -d "$REPO_DIR" ]]; then
+    (cd "$REPO_DIR" && git pull --ff-only)
 else
-	git clone https://github.com/zeronet-conservancy/zeronet-conservancy
-	cd zeronet-conservancy
+    git clone https://github.com/zeronet-conservancy/zeronet-conservancy "$REPO_DIR"
 fi
 
 pkg update -y
@@ -16,5 +17,4 @@ echo "Starting tor..."
 tor --ControlPort 9051 --CookieAuthentication 1 >/dev/null &
 
 echo "Starting zeronet-conservancy..."
-./start-venv.sh
-cd ..
+(cd "$REPO_DIR" && ./"$VENV_SCRIPT")