From 8d2a35c53e53a2dd175a39daccfedc7a58c5300e Mon Sep 17 00:00:00 2001
From: Samuel Huang <samuelh2006@gmail.com>
Date: Mon, 30 Sep 2024 22:09:01 +1000
Subject: [PATCH] Codacy compliant

---
 server-lgp.sh   | 2 +-
 server-lgr.sh   | 4 ++--
 server-lgt.sh   | 2 +-
 server-lsp.sh   | 2 +-
 server-lst.sh   | 2 +-
 server-ltr.sh   | 4 ++--
 server-ltt.sh   | 2 +-
 server-lwp.sh   | 2 +-
 server-lwt.sh   | 2 +-
 server-mtt.sh   | 2 +-
 server-mwp.sh   | 2 +-
 server-mwt.sh   | 2 +-
 server-nginx.sh | 2 +-
 server-ttt.sh   | 2 +-
 server-twp.sh   | 2 +-
 server-twt.sh   | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/server-lgp.sh b/server-lgp.sh
index 2501ca5..68ff38a 100755
--- a/server-lgp.sh
+++ b/server-lgp.sh
@@ -48,7 +48,7 @@ if [ -z "${serviceName}" ]; then
     usage; exit 1
 fi
 
-if [ -z "${xuser[@]}" ]; then
+if [ "${#xuser[@]}" -eq 0 ]; then
     >&2 echo -e "Error: User undefined.\n"
     usage; exit 1
 fi
diff --git a/server-lgr.sh b/server-lgr.sh
index 42ea2a7..d7f9ec3 100755
--- a/server-lgr.sh
+++ b/server-lgr.sh
@@ -74,7 +74,7 @@ if [ -z "${serviceName}" ]; then
     usage; exit 1
 fi
 
-if [ -z "${xuser[@]}" ]; then
+if [ "${#xuser[@]}" -eq 0 ]; then
     >&2 echo -e "Error: User undefined.\n"
     usage; exit 1
 fi
@@ -113,7 +113,7 @@ inbound=$(echo $inbound| jq -c --arg dest "${dest}" --arg pubkey "${pubkey}" --a
 '.streamSettings.realitySettings += {"show":true,"dest":"\($dest):443","serverNames":[$dest],"privateKey":$prvkey,"publicKey":$pubkey}')
 
 # serverNames settings
-if [ -n "${serverNames[@]}" ]; then
+if [ "${#serverNames[@]}" -gt 0 ]; then
     JserverNames=$(printf '%s\n' "${serverNames[@]}"|jq -R|jq -sc)
     inbound=$(echo $inbound| jq -c --argjson JserverNames "${JserverNames}" '.streamSettings.realitySettings.serverNames += $JserverNames')
 fi
diff --git a/server-lgt.sh b/server-lgt.sh
index 9a18c14..3adb020 100755
--- a/server-lgt.sh
+++ b/server-lgt.sh
@@ -62,7 +62,7 @@ if [ -z "${serviceName}" ]; then
     usage; exit 1
 fi
 
-if [ -z "${xuser[@]}" ]; then
+if [ "${#xuser[@]}" -eq 0 ]; then
     >&2 echo -e "Error: User undefined.\n"
     usage; exit 1
 fi
diff --git a/server-lsp.sh b/server-lsp.sh
index b589a65..9d706a7 100755
--- a/server-lsp.sh
+++ b/server-lsp.sh
@@ -48,7 +48,7 @@ if [ -z "${webpath}" ]; then
     usage; exit 1
 fi
 
-if [ -z "${xuser[@]}" ]; then
+if [ "${#xuser[@]}" -eq 0 ]; then
     >&2 echo -e "Error: User undefined.\n"
     usage; exit 1
 fi
diff --git a/server-lst.sh b/server-lst.sh
index b94e563..aa5c3d0 100755
--- a/server-lst.sh
+++ b/server-lst.sh
@@ -62,7 +62,7 @@ if [ -z "${webpath}" ]; then
     usage; exit 1
 fi
 
-if [ -z "${xuser[@]}" ]; then
+if [ "${#xuser[@]}" -eq 0 ]; then
     >&2 echo -e "Error: User undefined.\n"
     usage; exit 1
 fi
diff --git a/server-ltr.sh b/server-ltr.sh
index 764cb1b..11713a1 100755
--- a/server-ltr.sh
+++ b/server-ltr.sh
@@ -66,7 +66,7 @@ if [ -z "${prvkey}" ]; then
     >&2 echo -e "PublicKey: $pubkey\n"
 fi
 
-if [ -z "${xuser[@]}" ]; then
+if [ "${#xuser[@]}" -eq 0 ]; then
     >&2 echo -e "Error: User undefined.\n"
     usage; exit 1
 fi
@@ -105,7 +105,7 @@ inbound=$(echo $inbound| jq -c --arg dest "${dest}" --arg pubkey "${pubkey}" --a
 '.streamSettings.realitySettings += {"show":true,"dest":"\($dest):443","serverNames":[$dest],"privateKey":$prvkey,"publicKey":$pubkey}')
 
 # serverNames settings
-if [ -n "${serverNames[@]}" ]; then
+if [ "${#serverNames[@]}" -gt 0 ]; then
     JserverNames=$(printf '%s\n' "${serverNames[@]}"|jq -R|jq -sc)
     inbound=$(echo $inbound| jq -c --argjson JserverNames "${JserverNames}" '.streamSettings.realitySettings.serverNames += $JserverNames')
 fi
diff --git a/server-ltt.sh b/server-ltt.sh
index c9d6c8e..deafbb4 100755
--- a/server-ltt.sh
+++ b/server-ltt.sh
@@ -54,7 +54,7 @@ if [ -z "${port}" ]; then
     usage; exit 1 ;
 fi
 
-if [ -z "${xuser[@]}" ]; then
+if [ "${#xuser[@]}" -eq 0 ]; then
     >&2 echo -e "Error: User undefined.\n"
     usage; exit 1
 fi
diff --git a/server-lwp.sh b/server-lwp.sh
index ae9c94d..89dc4ef 100755
--- a/server-lwp.sh
+++ b/server-lwp.sh
@@ -48,7 +48,7 @@ if [ -z "${wspath}" ]; then
     usage; exit 1
 fi
 
-if [ -z "${xuser[@]}" ]; then
+if [ "${#xuser[@]}" -eq 0 ]; then
     >&2 echo -e "Error: User undefined.\n"
     usage; exit 1
 fi
diff --git a/server-lwt.sh b/server-lwt.sh
index 43e85cb..dd45059 100755
--- a/server-lwt.sh
+++ b/server-lwt.sh
@@ -62,7 +62,7 @@ if [ -z "${wspath}" ]; then
     usage; exit 1
 fi
 
-if [ -z "${xuser[@]}" ]; then
+if [ "${#xuser[@]}" -eq 0 ]; then
     >&2 echo -e "Error: User undefined.\n"
     usage; exit 1
 fi
diff --git a/server-mtt.sh b/server-mtt.sh
index ce76219..a990450 100755
--- a/server-mtt.sh
+++ b/server-mtt.sh
@@ -54,7 +54,7 @@ if [ -z "${port}" ]; then
     usage; exit 1 ;
 fi
 
-if [ -z "${xuser[@]}" ]; then
+if [ "${#xuser[@]}" -eq 0 ]; then
     >&2 echo -e "Error: User undefined.\n"
     usage; exit 1
 fi
diff --git a/server-mwp.sh b/server-mwp.sh
index 9da3874..2bf3c36 100755
--- a/server-mwp.sh
+++ b/server-mwp.sh
@@ -48,7 +48,7 @@ if [ -z "${wspath}" ]; then
     usage; exit 1
 fi
 
-if [ -z "${xuser[@]}" ]; then
+if [ "${#xuser[@]}" -eq 0 ]; then
     >&2 echo -e "Error: User undefined.\n"
     usage; exit 1
 fi
diff --git a/server-mwt.sh b/server-mwt.sh
index a240938..d5beabd 100755
--- a/server-mwt.sh
+++ b/server-mwt.sh
@@ -62,7 +62,7 @@ if [ -z "${wspath}" ]; then
     usage; exit 1
 fi
 
-if [ -z "${xuser[@]}" ]; then
+if [ "${#xuser[@]}" -eq 0 ]; then
     >&2 echo -e "Error: User undefined.\n"
     usage; exit 1
 fi
diff --git a/server-nginx.sh b/server-nginx.sh
index 75ffc66..b865607 100755
--- a/server-nginx.sh
+++ b/server-nginx.sh
@@ -104,7 +104,7 @@ options=($(echo $STSVR |tr ',' ' '))
             esac
         done
         # Naming the upstream as yahoo_com_jp for SNI yahoo.com.jp
-        upsname=$(echo "${sni//\./_}")
+        upsname="${sni//\./_}"
         echo "        $sni $upsname;"       >>/tmp/stmap.conf
         echo "    upstream $upsname {"      >>/tmp/stups.conf
         echo "        server $upstream;"    >>/tmp/stups.conf
diff --git a/server-ttt.sh b/server-ttt.sh
index b6f7f60..75c7703 100755
--- a/server-ttt.sh
+++ b/server-ttt.sh
@@ -54,7 +54,7 @@ if [ -z "${port}" ]; then
     usage; exit 1 ;
 fi
 
-if [ -z "${xuser[@]}" ]; then
+if [ "${#xuser[@]}" -eq 0 ]; then
     >&2 echo -e "Error: User undefined.\n"
     usage; exit 1
 fi
diff --git a/server-twp.sh b/server-twp.sh
index fde1e87..4eb24c9 100755
--- a/server-twp.sh
+++ b/server-twp.sh
@@ -48,7 +48,7 @@ if [ -z "${wspath}" ]; then
     usage; exit 1
 fi
 
-if [ -z "${xuser[@]}" ]; then
+if [ "${#xuser[@]}" -eq 0 ]; then
     >&2 echo -e "Error: User undefined.\n"
     usage; exit 1
 fi
diff --git a/server-twt.sh b/server-twt.sh
index 5424faa..0206143 100755
--- a/server-twt.sh
+++ b/server-twt.sh
@@ -62,7 +62,7 @@ if [ -z "${wspath}" ]; then
     usage; exit 1
 fi
 
-if [ -z "${xuser[@]}" ]; then
+if [ "${#xuser[@]}" -eq 0 ]; then
     >&2 echo -e "Error: User undefined.\n"
     usage; exit 1
 fi