Merge pull request #686 from six2dez/dev

Fixes for webUI installation and setting up
six2dez · Apr 25, 2023 · 0381a1b · 0381a1b
2 parents 7d5b5ab + 4a5546d
commit 0381a1b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/install.sh b/install.sh
@@ -372,23 +372,23 @@ if [ "$install_golang" = "true" ]; then
             eval $SUDO rm -rf /usr/local/go $DEBUG_STD
             if [ "True" = "$IS_ARM" ]; then
                 if [ "True" = "$RPI_3" ]; then
-                    eval wget "https://dl.google.com/go/${version}.linux-armv6l.tar.gz" $DEBUG_STD
-                    eval $SUDO tar -C /usr/local -xzf "${version}.linux-armv6l.tar.gz" $DEBUG_STD
+                    eval wget "https://dl.google.com/go/${version}.linux-armv6l.tar.gz" -O /tmp/${version}.linux-armv6l.tar.gz $DEBUG_STD
+                    eval $SUDO tar -C /usr/local -xzf /tmp/"${version}.linux-armv6l.tar.gz" $DEBUG_STD
                 elif [ "True" = "$RPI_4" ]; then
-                    eval wget "https://dl.google.com/go/${version}.linux-arm64.tar.gz" $DEBUG_STD
-                    eval $SUDO tar -C /usr/local -xzf "${version}.linux-arm64.tar.gz" $DEBUG_STD
+                    eval wget "https://dl.google.com/go/${version}.linux-arm64.tar.gz" -O /tmp/${version}.linux-arm64.tar.gz $DEBUG_STD
+                    eval $SUDO tar -C /usr/local -xzf /tmp/"${version}.linux-arm64.tar.gz" $DEBUG_STD
                 fi
             elif [ "True" = "$IS_MAC" ]; then
                 if [ "True" = "$IS_ARM" ]; then
-                    eval wget "https://dl.google.com/go/${version}.darwin-arm64.tar.gz" $DEBUG_STD
-                    eval $SUDO tar -C /usr/local -xzf "${version}.darwin-arm64.tar.gz" $DEBUG_STD
+                    eval wget "https://dl.google.com/go/${version}.darwin-arm64.tar.gz" -O /tmp/${version}.darwin-arm64.tar.gz $DEBUG_STD
+                    eval $SUDO tar -C /usr/local -xzf /tmp/"${version}.darwin-arm64.tar.gz" $DEBUG_STD
                 else
-                    eval wget "https://dl.google.com/go/${version}.darwin-amd64.tar.gz" $DEBUG_STD
-                    eval $SUDO tar -C /usr/local -xzf "${version}.darwin-amd64.tar.gz" $DEBUG_STD
+                    eval wget "https://dl.google.com/go/${version}.darwin-amd64.tar.gz" -O /tmp/${version}.darwin-amd64.tar.gz $DEBUG_STD
+                    eval $SUDO tar -C /usr/local -xzf /tmp/"${version}.darwin-amd64.tar.gz" $DEBUG_STD
                 fi
             else
-                eval wget "https://dl.google.com/go/${version}.linux-amd64.tar.gz" $DEBUG_STD
-                eval $SUDO tar -C /usr/local -xzf "${version}.linux-amd64.tar.gz" $DEBUG_STD
+                eval wget "https://dl.google.com/go/${version}.linux-amd64.tar.gz" -O /tmp/${version}.linux-amd64.tar.gz $DEBUG_STD
+                eval $SUDO tar -C /usr/local -xzf /tmp/"${version}.linux-amd64.tar.gz" $DEBUG_STD
             fi
             eval $SUDO ln -sf /usr/local/go/bin/go /usr/local/bin/
             #rm -rf $version*

diff --git a/reconftw.sh b/reconftw.sh
@@ -2827,9 +2827,8 @@ function webserver(){
 
 		if [ "$ipAddress" != "" ]; then
 			printf "\n ${bblue}Starting web server... ${reset}\n"
-			$SUDO source .venv/bin/activate
-			cd web
-			# $SUDO service postgresql start
+			cd $SCRIPTPATH/web || { echo "Failed to cd to $dir in ${FUNCNAME[0]} @ line ${LINENO}"; exit 1; }
+			$SUDO source $SCRIPTPATH/web/.venv/bin/activate
 			$SUDO screen -S ReconftwWebserver -X kill &>/dev/null
 			$SUDO screen -dmS ReconftwWebserver python3 manage.py runserver $ipAddress:8001 &>/dev/null
 			$SUDO service redis-server start &>/dev/null