Edit revents needing node*

setup.sh

@@ -1,53 +1,58 @@
 #!/usr/bin/env bash
 IFS=""
 reuri="http://localhost:5000/callback" # Callback uri
-echo "Notice: THIS REQUIRES NODE TO BE INSTALLED!"
+echo "Notice: THIS REQUIRES NODE TO BE INSTALLED! ~ Unless 'authkeys' is present within the folder and contains the correct data!"
 pkill node &>/dev/null
-if [ ! -d ./web-api-auth-examples ]; then
-  if [ -f $(which git) ]; then
-  	git submodule update --init
-  	git clone git://github.com/zhenyu0519/web-api-auth-examples.git &>/dev/null
-  elif [ -f $(which curl) ] && [ -f $(which tar) ]; then 
-	curl -#L "http://github.com/zhenyu0519/web-api-auth-examples/archive/master.tar.gz" | tar xfz - && mv ./web-api-auth-examples-master/ ./web-api-auth-examples 
-  else 
-	echo "Couldn't find a way to clone github/zhenyu0519/web-api-auth-examples/"
-	echo "Supported ways are:"
-	printf 'Tar & cURL\nGit Clone\n'
-	echo "Please download and safe github/zhenyu0519/web-api-auth-examples/ to ./web-api-auth-examples"
-	exit 1
+if [ ! -f ./authkeys ];then # This allows one to avoid the nodeJS setup by just having a autkeys file  
+  if [ ! -d ./web-api-auth-examples ]; then
+    if [ -f $(which git) ]; then
+  	  git submodule update --init
+  	  git clone git://github.com/zhenyu0519/web-api-auth-examples.git &>/dev/null
+    elif [ -f $(which curl) ] && [ -f $(which tar) ]; then 
+	  curl -#L "http://github.com/zhenyu0519/web-api-auth-examples/archive/master.tar.gz" | tar xfz - && mv ./web-api-auth-examples-master/ ./web-api-auth-examples 
+    else 
+	  echo "Couldn't find a way to clone github/zhenyu0519/web-api-auth-examples/"
+	  echo "Supported ways are:"
+	  printf 'Tar & cURL\nGit Clone\n'
+	  echo "Please download and safe github/zhenyu0519/web-api-auth-examples/ to ./web-api-auth-examples"
+	  exit 1
+    fi
   fi
-fi
+fi  
 # Ik Ik https is better, but some devices have issues with ssl, (as does mine), thus I am trying to avoid it
 ##
-  cd ./web-api-auth-examples/authorization_code
-  cp ../../app.patch ./
-  patch -Np0 ./app.js < ./app.patch
-  cd ./public
-  cp ../../../index.patch ./
-  patch -Np0 ./index.html < ./index.patch
-  cd ../../../
-  cp ./web-api-auth-examples/authorization_code/* -r ./
-  cp ./web-api-auth-examples/authorization_code/public -r ./
+  if [ ! -f ./authkeys ]; then 
+	cd ./web-api-auth-examples/authorization_code
+  	cp ../../app.patch ./
+  	patch -Np0 ./app.js < ./app.patch
+  	cd ./public
+  	cp ../../../index.patch ./
+  	patch -Np0 ./index.html < ./index.patch
+  	cd ../../../
+  	cp ./web-api-auth-examples/authorization_code/* -r ./
+  	cp ./web-api-auth-examples/authorization_code/public -r ./
+  fi
 ##
-if [ ! -f ./clients ]; then
-  echo -n 'Client ID ='
-  read CLID
-  echo -n 'Client Secret ='
-  read CLSEC
-else
-  source ./clients
+if [ ! -f ./authkeys ]; then
+	if [ ! -f ./clients ]; then
+  		echo -n 'Client ID ='
+  		read CLID
+  		echo -n 'Client Secret ='
+  		read CLSEC
+        else
+  		source ./clients
+	fi
+	sed -i "s/'id';/'${CLID}';/g" ./app.js
+	sed -i "s/'sec';/'${CLSEC}';/g" ./app.js
 fi
-sed -i "s/'id';/'${CLID}';/g" ./app.js
-sed -i "s/'sec';/'${CLSEC}';/g" ./app.js
-
-if [ ! -f $(which npm) ]; then
+if [ ! -f ./authkeys ] && [ ! -f "$(which npm 2/dev/null)" ]; then
   echo "npm is required!"
   exit 1
 elif [ ! -d ./node_modules/fs ]; then
-  npm install --save fs
+  [ -f "$(which npm 2>/dev/null)" ] && npm install --save fs
 fi
-if [ ! -d ./node_modules/http ]; then
-  npm install --save http
+if [ ! -f ./authkeys ] && [ ! -d ./node_modules/http ]; then
+  [ -f "$(which npm 2>/dev/null)" ] && npm install --save http
 fi
 
 if [ -d ./node_modules/ ] && [ $(ls ./node_modules/ | wc -l) -lt 54 ] || [ -d ./node_modules/ ] && [ $(ls ./node_modules | wc -l ) != 54 ] ; then
@@ -58,31 +63,37 @@ if [ -d ./node_modules/ ] && [ $(ls ./node_modules/ | wc -l) -lt 54 ] || [ -d ./
   npm install &>/dev/null
   mv ./node_modules ../
   cd ../
-elif [ ! -d ./node_modules/ ]; then
+elif [ ! -f ./authkeys ] && [ ! -d ./node_modules/ ]; then
   cd ./web-api-auth-examples/
   echo "Installing auth examples"
   npm install &>/dev/null
   mv ./node_modules ../
   cd ../
 fi
-rm ./web-api-auth-examples/ -rf
+[ -d ./web-api-auth-examples ] && rm ./web-api-auth-examples/ -rf
+if [ ! -f ./authkeys ]; then 
 cat << EOF > ./public/consts.js
 	const client_id = "${CLID}";
 	const client_secret = "${CLSEC}";
 	console.log("client_id is: " + client_id + "\n client_secret is: " + client_secret);
 EOF
-echo "Please open 'localhost:5000' in your browser"
-node ./app.js > ./authkeys & disown
-until [ -f ./authkeys ] && [ $(cat ./authkeys) != "" ]; do
-	sleep 1
-done
-echo $(cat ./authkeys | sed -z 's/%\n/REKEY=/g') > ./authkeys
-echo "Authkeys were written to ./authkeys"
-sed -i "s/client_id = '.*'/client_id = 'id'/g" ./app.js
-sed -i "s/client_secret = '.*'/client_secret = 'sec'/g" ./app.js
-printf 'CLID=%b\nCLSEC=%b' "${CLID}" "${CLSEC}" > ./clients
-echo "ID and Secrets have been written to ./clients"
-#rm ./public -rf
-mkdir -p ${XDG_CACHE_HOME:-$HOME/.cache/}//spotbash
-cat ./clients >> ./authkeys
-cp ./authkeys ${XDG_CACHE_HOME:-$HOME/.cache/}//spotbash
+	echo "Please open 'localhost:5000' in your browser"
+	[ -f $(node) ] && node ./app.js > ./authkeys & disown
+	until [ -f ./authkeys ] && [ $(cat ./authkeys) != "" ]; do
+		sleep 1
+	done
+	echo $(cat ./authkeys | sed -z 's/%\n/REKEY=/g') > ./authkeys
+	echo "Authkeys were written to ./authkeys"
+	sed -i "s/client_id = '.*'/client_id = 'id'/g" ./app.js
+	sed -i "s/client_secret = '.*'/client_secret = 'sec'/g" ./app.js
+	printf 'CLID=%b\nCLSEC=%b' "${CLID}" "${CLSEC}" > ./clients
+	echo "ID and Secrets have been written to ./clients"
+	mkdir -p ${XDG_CACHE_HOME:-$HOME/.cache/}//spotbash
+	cat ./clients >> ./authkeys
+	cp ./authkeys ${XDG_CACHE_HOME:-$HOME/.cache/}//spotbash
+fi
+if [ -f ./authkeys ] && [ ! -f ${XDG_CACHE_HOME:-$HOME/.cache/}//spotbash/authkeys ]; then
+	echo "Creating and copying 'authkeys' to ${XDG_CACHE_HOME:-$HOME/.cache/}/spotbash/"
+	mkdir -p ${XDG_CACHE_HOME:-$HOME/.cache/}//spotbash
+	cp ./authkeys ${XDG_CACHE_HOME:-$HOME/.cache/}//spotbash/ 
+fi