Codacy compliant

2025-12-16 11:57:07 +03:00 · 2024-10-01 08:20:43 +10:00
parent 614d53e540
commit 368a9c36e0
17 changed files with 31 additions and 31 deletions
--- a/run.sh
+++ b/run.sh
@@ -78,13 +78,13 @@ while true ; do
            ;;
        --lgp|--lgr|--lgt|--lsp|--lst|--ltr|--ltt|--lwp|--lwt|--mtt|--mwp|--mwt|--ttt|--twp|--twt)
            # Alias options
-            SVC=$(echo $1|tr -d '\-\-')
+            SVC=$(echo "$1"|tr -d "\-\-")
            SVCMD+=("${DIR}/server-${SVC}.sh $2")
            shift 2
            ;;
        --ltrx|--lttx)
            # Alias options
-            SVC=$(echo $1|tr -d '\-\-'|tr -d x)
+            SVC=$(echo "$1"|tr -d "\-\-"|tr -d "x")
            SVCMD+=("${DIR}/server-${SVC}.sh $2,xtls")
            shift 2
            ;;
@@ -156,7 +156,7 @@ if [ "${#CERTDOMAIN[@]}" -gt 0 ]; then
        do
            echo "Requesting TLS cert for ${DOMAIN} ..."
            echo "/root/acme.sh/acme.sh --cert-home ${CERTHOME} --issue --standalone -d ${DOMAIN} --debug"
-            /root/acme.sh/acme.sh --cert-home "${CERTHOME}" --issue --standalone -d ${DOMAIN} --debug
+            /root/acme.sh/acme.sh --cert-home "${CERTHOME}" --issue --standalone -d "${DOMAIN}" --debug
            ((TRY++))
            if [ "${TRY}" -ge 3 ]; then
                echo "Requesting TLS cert for ${DOMAIN} failed. Check log please."
--- a/server-lgp.sh
+++ b/server-lgp.sh
@@ -89,7 +89,7 @@ inbound=$(echo $inbound| jq -c '.streamSettings += {"security":"none"}')
 # Fallback settings
 for fb in "${fallback[@]}"
 do
-    IFS=':'; fopt=(${fb}); fopt=(${fopt[@]})
+    IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
    fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
    unset IFS
    if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi
--- a/server-lgr.sh
+++ b/server-lgr.sh
@@ -126,7 +126,7 @@ inbound=$(echo $inbound| jq -c --argjson JshortIds "${JshortIds}" '.streamSettin
 # Fallback settings
 for fb in "${fallback[@]}"
 do
-    IFS=':'; fopt=(${fb}); fopt=(${fopt[@]})
+    IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
    fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
    unset IFS
    if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi
--- a/server-lgt.sh
+++ b/server-lgt.sh
@@ -107,7 +107,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
 # Fallback settings
 for fb in "${fallback[@]}"
 do
-    IFS=':'; fopt=(${fb}); fopt=(${fopt[@]})
+    IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
    fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
    unset IFS
    if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi
--- a/server-lsp.sh
+++ b/server-lsp.sh
@@ -89,7 +89,7 @@ inbound=$(echo $inbound| jq -c '.streamSettings += {"security":"none"}')
 # Fallback settings
 for fb in "${fallback[@]}"
 do
-    IFS=':'; fopt=(${fb}); fopt=(${fopt[@]})
+    IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
    fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
    unset IFS
    if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi
--- a/server-lst.sh
+++ b/server-lst.sh
@@ -107,7 +107,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
 # Fallback settings
 for fb in "${fallback[@]}"
 do
-    IFS=':'; fopt=(${fb}); fopt=(${fopt[@]})
+    IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
    fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
    unset IFS
    if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi
--- a/server-ltr.sh
+++ b/server-ltr.sh
@@ -118,7 +118,7 @@ inbound=$(echo $inbound| jq -c --argjson JshortIds "${JshortIds}" '.streamSettin
 # Fallback settings
 for fb in "${fallback[@]}"
 do
-    IFS=':'; fopt=(${fb}); fopt=(${fopt[@]})
+    IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
    fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
    unset IFS
    if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi
--- a/server-ltt.sh
+++ b/server-ltt.sh
@@ -99,7 +99,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
 # Fallback settings
 for fb in "${fallback[@]}"
 do
-    IFS=':'; fopt=(${fb}); fopt=(${fopt[@]})
+    IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
    fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
    unset IFS
    if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi
--- a/server-lwp.sh
+++ b/server-lwp.sh
@@ -89,7 +89,7 @@ inbound=$(echo $inbound| jq -c '.streamSettings += {"security":"none"}')
 # Fallback settings
 for fb in "${fallback[@]}"
 do
-    IFS=':'; fopt=(${fb}); fopt=(${fopt[@]})
+    IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
    fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
    unset IFS
    if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi
--- a/server-lwt.sh
+++ b/server-lwt.sh
@@ -107,7 +107,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
 # Fallback settings
 for fb in "${fallback[@]}"
 do
-    IFS=':'; fopt=(${fb}); fopt=(${fopt[@]})
+    IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
    fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
    unset IFS
    if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi
--- a/server-mtt.sh
+++ b/server-mtt.sh
@@ -99,7 +99,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
 # Fallback settings
 for fb in "${fallback[@]}"
 do
-    IFS=':'; fopt=(${fb}); fopt=(${fopt[@]})
+    IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
    fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
    unset IFS
    if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi
--- a/server-mwp.sh
+++ b/server-mwp.sh
@@ -89,7 +89,7 @@ inbound=$(echo $inbound| jq -c '.streamSettings += {"security":"none"}')
 # Fallback settings
 for fb in "${fallback[@]}"
 do
-    IFS=':'; fopt=(${fb}); fopt=(${fopt[@]})
+    IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
    fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
    unset IFS
    if [ -z "${fport}" ]; then
--- a/server-mwt.sh
+++ b/server-mwt.sh
@@ -107,7 +107,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
 # Fallback settings
 for fb in "${fallback[@]}"
 do
-    IFS=':'; fopt=(${fb}); fopt=(${fopt[@]})
+    IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
    fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
    unset IFS
    if [ -z "${fport}" ]; then
--- a/server-nginx.sh
+++ b/server-nginx.sh
@@ -114,18 +114,18 @@ if [ -n "${STSVR}" ]; then
    done

    # Adding map.conf down to #XMAP_TAG tag
-    sed -i '/#XMAP_TAG/r /tmp/stmap.conf' $NGCONF
+    sed -i '/#XMAP_TAG/r /tmp/stmap.conf' "$NGCONF"
    # Adding ups.conf down to #XUPSTREAM_TAG tag
-    sed -i '/#XUPSTREAM_TAG/r /tmp/stups.conf' $NGCONF
-    sed -i "s/STPORT/${STPORT}/g" $NGCONF
+    sed -i '/#XUPSTREAM_TAG/r /tmp/stups.conf' "$NGCONF"
+    sed -i "s/STPORT/${STPORT}/g" "$NGCONF"
    # Adding "proxy_protocol=on" down to #STPROXY_PASS_TAG tag
    if [ -n "${STPROXY_PASS}" ]; then
        echo "        proxy_protocol on;" >/tmp/stproxy.conf
-        sed -i '/#STPROXY_PASS_TAG/r /tmp/stproxy.conf' $NGCONF
+        sed -i '/#STPROXY_PASS_TAG/r /tmp/stproxy.conf' "$NGCONF"
    fi
    rm -rf /tmp/stmap.conf; rm -rf /tmp/stups.conf; rm -rf /tmp/stproxy.conf
    echo "Generated $NGCONF ====>"
-    cat $NGCONF
+    cat "$NGCONF"
 fi

 # Generating Nginx site server configurations.
@@ -194,7 +194,7 @@ do
            sed -i 's/proxy_add_x_forwarded_for/proxy_protocol_addr/g' "${site_domain}.conf"
        fi
        echo "Generated /etc/nginx/conf.d/${site_domain}.conf ====>"
-        cat /etc/nginx/conf.d/${site_domain}.conf
+        cat "/etc/nginx/conf.d/${site_domain}.conf"
    done
 done

@@ -239,19 +239,19 @@ do
        # Add tpl file content down to #LOCATION tag
        case "${xnetwork}" in
            ws|websocket)
-                sed -i '/#XLOCATION_TAG/r nginx-ws.tpl' ${xdomain}.conf
+                sed -i '/#XLOCATION_TAG/r nginx-ws.tpl' "${xdomain}.conf"
                ;;
            grpc)
-                sed -i '/#XLOCATION_TAG/r nginx-grpc.tpl' ${xdomain}.conf
+                sed -i '/#XLOCATION_TAG/r nginx-grpc.tpl' "${xdomain}.conf"
                ;;
            splt|proxy)
-                sed -i '/#XLOCATION_TAG/r nginx-proxy.tpl' ${xdomain}.conf
+                sed -i '/#XLOCATION_TAG/r nginx-proxy.tpl' "${xdomain}.conf"
                ;;
        esac
        ESC_LOCATION=$(printf '%s\n' "${xlocation}" | sed -e 's/[]\/$*.^[]/\\&/g')
-        sed -i "s/HOST/${xhost}/g" ${xdomain}.conf
-        sed -i "s/PORT/${xport}/g" ${xdomain}.conf
-        sed -i "s/WEBPATH/${ESC_LOCATION}/g" ${xdomain}.conf
+        sed -i "s/HOST/${xhost}/g" "${xdomain}.conf"
+        sed -i "s/PORT/${xport}/g" "${xdomain}.conf"
+        sed -i "s/WEBPATH/${ESC_LOCATION}/g" "${xdomain}.conf"
        # Applying proxy log format instead of main format when --ng-server proxy_pass was set
        if [ -n "${NGPROTOCOL}" ]; then
            sed -i '/access_log/s/main/proxy/' "${xdomain}.conf"
@@ -259,7 +259,7 @@ do
            sed -i 's/proxy_add_x_forwarded_for/proxy_protocol_addr/g' "${xdomain}.conf"
        fi
        echo "Generated /etc/nginx/conf.d/${xdomain}.conf ====>"
-        cat /etc/nginx/conf.d/${xdomain}.conf
+        cat "/etc/nginx/conf.d/${xdomain}.conf"
    done
 done
 exit 0
--- a/server-ttt.sh
+++ b/server-ttt.sh
@@ -99,7 +99,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
 # Fallback settings
 for fb in "${fallback[@]}"
 do
-    IFS=':'; fopt=(${fb}); fopt=(${fopt[@]})
+    IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
    fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
    unset IFS
    if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi
--- a/server-twp.sh
+++ b/server-twp.sh
@@ -89,7 +89,7 @@ inbound=$(echo $inbound| jq -c '.streamSettings += {"security":"none"}')
 # Fallback settings
 for fb in "${fallback[@]}"
 do
-    IFS=':'; fopt=(${fb}); fopt=(${fopt[@]})
+    IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
    fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
    unset IFS
    if [ -z "${fport}" ]; then
--- a/server-twt.sh
+++ b/server-twt.sh
@@ -107,7 +107,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
 # Fallback settings
 for fb in "${fallback[@]}"
 do
-    IFS=':'; fopt=(${fb}); fopt=(${fopt[@]})
+    IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
    fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
    unset IFS
    if [ -z "${fport}" ]; then