Browse Source

Merge pull request #1356 from abhishek9686/bugfix_v0.14.3_netclient_script

Bugfix v0.14.3 netclient script
dcarns 3 years ago
parent
commit
e280a3a442
2 changed files with 13 additions and 11 deletions
  1. 12 10
      scripts/netclient-install.sh
  2. 1 1
      scripts/token-convert.sh

+ 12 - 10
scripts/netclient-install.sh

@@ -51,6 +51,8 @@ if [ -z "${install_cmd}" ]; then
 	exit 1
 fi
 
+${update_cmd}
+
 set -- $dependencies
 while [ -n "$1" ]; do
     echo $1
@@ -130,29 +132,29 @@ case $(uname | tr '[:upper:]' '[:lower:]') in
 				dist=netclient-arm64
 			;;
 			aarch64)
-                                dist=netclient-arm64
+                dist=netclient-arm64
 			;;
 			armv6l)
-                                dist=netclient-arm6
+                dist=netclient-arm6
 			;;
 			armv7l)
-                                dist=netclient-arm7
+                dist=netclient-arm7
 			;;
 			arm*)
 				dist=netclient-$CPU_ARCH
 			;;
-                        mipsle)
-                                dist=netclient-mipsle
+            mipsle)
+                dist=netclient-mipsle
 			;;
 			*)
 				fatal "$CPU_ARCH : cpu architecture not supported"
     		esac
 	;;
 	darwin)
-        	dist=netclient-darwin
+        dist=netclient-darwin
 	;;
 	Darwin)
-        	dist=netclient-darwin
+        dist=netclient-darwin
 	;;
 	freebsd*)
 		if [ -z "$CPU_ARCH" ]; then
@@ -169,14 +171,14 @@ case $(uname | tr '[:upper:]' '[:lower:]') in
 				dist=netclient-freebsd-arm64
 			;;
 			aarch64)
-                                dist=netclient-freebsd-arm64
+                dist=netclient-freebsd-arm64
 			;;
 			armv7l)
-                                dist=netclient-freebsd-arm7
+                dist=netclient-freebsd-arm7
 			;;
 			arm*)
 				dist=netclient-freebsd-$CPU_ARCH
-            		;;
+            ;;
 			*)
 				fatal "$CPU_ARCH : cpu architecture not supported"
     		esac

+ 1 - 1
scripts/token-convert.sh

@@ -6,7 +6,7 @@ token=$1
 
 token_json=$(echo $token | base64 -d)
 
-api_addr=$(echo $token_json | jq -r '.apiconn')
+api_addr=$(echo $token_json | jq -r '.apiconnstring')
 network=$(echo $token_json | jq -r '.network')
 key=$(echo $token_json | jq -r '.key')