From 029260501d0a1a2de758612d0e2650b7e772773d Mon Sep 17 00:00:00 2001 From: Samuel Huang Date: Mon, 13 Sep 2021 16:55:50 +1000 Subject: [PATCH] Port occupation issue fix --- server-ltpg.sh | 2 ++ server-ltpw.sh | 2 ++ server-ltt.sh | 2 ++ server-lttg.sh | 2 ++ server-lttw.sh | 2 ++ server-ltx.sh | 2 ++ server-mtpw.sh | 2 ++ server-mtt.sh | 2 ++ server-mttw.sh | 2 ++ server-ttpw.sh | 2 ++ server-ttt.sh | 2 ++ server-tttw.sh | 2 ++ 12 files changed, 24 insertions(+) diff --git a/server-ltpg.sh b/server-ltpg.sh index 3131277..33e21b1 100755 --- a/server-ltpg.sh +++ b/server-ltpg.sh @@ -43,6 +43,8 @@ fi if ! [ "${port}" -eq "${port}" ] 2>/dev/null; then >&2 echo "Port number must be numeric"; exit 1; fi XCONF=$xconf +# Remove existing port number if existing. +cat $XCONF |jq --arg port "${port}" 'del( .inbounds[] | select(.port == ($port|tonumber)) )' |sponge $XCONF cat $XCONF |jq --arg port "${port}" '.inbounds +=[{"port":($port|tonumber), "protocol":"vless", "settings":{"clients":[]}}]' |sponge $XCONF for xu in "${xuser[@]}" diff --git a/server-ltpw.sh b/server-ltpw.sh index 6ca4351..5c8e5e8 100755 --- a/server-ltpw.sh +++ b/server-ltpw.sh @@ -52,6 +52,8 @@ fi if ! [ "${port}" -eq "${port}" ] 2>/dev/null; then >&2 echo "Port number must be numeric"; exit 1; fi XCONF=$xconf +# Remove existing port number if existing. +cat $XCONF |jq --arg port "${port}" 'del( .inbounds[] | select(.port == ($port|tonumber)) )' |sponge $XCONF cat $XCONF |jq --arg port "${port}" '.inbounds +=[{"port":($port|tonumber), "protocol":"vless", "settings":{"clients":[]}}]' |sponge $XCONF for xu in "${xuser[@]}" diff --git a/server-ltt.sh b/server-ltt.sh index 4ab1168..d1f272c 100755 --- a/server-ltt.sh +++ b/server-ltt.sh @@ -61,6 +61,8 @@ fi if ! [ "${port}" -eq "${port}" ] 2>/dev/null; then >&2 echo "Port number must be numeric"; exit 1; fi XCONF=$xconf +# Remove existing port number if existing. +cat $XCONF |jq --arg port "${port}" 'del( .inbounds[] | select(.port == ($port|tonumber)) )' |sponge $XCONF cat $XCONF |jq --arg port "${port}" '.inbounds +=[{"port":($port|tonumber), "protocol":"vless", "settings":{"clients":[]}}]' |sponge $XCONF for xu in "${xuser[@]}" diff --git a/server-lttg.sh b/server-lttg.sh index 0462287..bc844d3 100755 --- a/server-lttg.sh +++ b/server-lttg.sh @@ -61,6 +61,8 @@ fi if ! [ "${port}" -eq "${port}" ] 2>/dev/null; then >&2 echo "Port number must be numeric"; exit 1; fi XCONF=$xconf +# Remove existing port number if existing. +cat $XCONF |jq --arg port "${port}" 'del( .inbounds[] | select(.port == ($port|tonumber)) )' |sponge $XCONF cat $XCONF |jq --arg port "${port}" '.inbounds +=[{"port":($port|tonumber), "protocol":"vless", "settings":{"clients":[]}}]' |sponge $XCONF for xu in "${xuser[@]}" diff --git a/server-lttw.sh b/server-lttw.sh index 91ef563..13e14cf 100755 --- a/server-lttw.sh +++ b/server-lttw.sh @@ -70,6 +70,8 @@ fi if ! [ "${port}" -eq "${port}" ] 2>/dev/null; then >&2 echo "Port number must be numeric"; exit 1; fi XCONF=$xconf +# Remove existing port number if existing. +cat $XCONF |jq --arg port "${port}" 'del( .inbounds[] | select(.port == ($port|tonumber)) )' |sponge $XCONF cat $XCONF |jq --arg port "${port}" '.inbounds +=[{"port":($port|tonumber), "protocol":"vless", "settings":{"clients":[]}}]' |sponge $XCONF for xu in "${xuser[@]}" diff --git a/server-ltx.sh b/server-ltx.sh index b33104f..b410c8a 100755 --- a/server-ltx.sh +++ b/server-ltx.sh @@ -61,6 +61,8 @@ fi if ! [ "${port}" -eq "${port}" ] 2>/dev/null; then >&2 echo "Port number must be numeric"; exit 1; fi XCONF=$xconf +# Remove existing port number if existing. +cat $XCONF |jq --arg port "${port}" 'del( .inbounds[] | select(.port == ($port|tonumber)) )' |sponge $XCONF cat $XCONF |jq --arg port "${port}" '.inbounds +=[{"port":($port|tonumber), "protocol":"vless", "settings":{"clients":[]}}]' |sponge $XCONF for xu in "${xuser[@]}" diff --git a/server-mtpw.sh b/server-mtpw.sh index 69a9cba..193eaeb 100755 --- a/server-mtpw.sh +++ b/server-mtpw.sh @@ -52,6 +52,8 @@ fi if ! [ "${port}" -eq "${port}" ] 2>/dev/null; then >&2 echo "Port number must be numeric"; exit 1; fi XCONF=$xconf +# Remove existing port number if existing. +cat $XCONF |jq --arg port "${port}" 'del( .inbounds[] | select(.port == ($port|tonumber)) )' |sponge $XCONF cat $XCONF |jq --arg port "${port}" '.inbounds +=[{"port":($port|tonumber), "protocol":"vmess", "settings":{"clients":[]}}]' |sponge $XCONF for xu in "${xuser[@]}" diff --git a/server-mtt.sh b/server-mtt.sh index bd93843..f7ec6a8 100755 --- a/server-mtt.sh +++ b/server-mtt.sh @@ -61,6 +61,8 @@ fi if ! [ "${port}" -eq "${port}" ] 2>/dev/null; then >&2 echo "Port number must be numeric"; exit 1; fi XCONF=$xconf +# Remove existing port number if existing. +cat $XCONF |jq --arg port "${port}" 'del( .inbounds[] | select(.port == ($port|tonumber)) )' |sponge $XCONF cat $XCONF |jq --arg port "${port}" '.inbounds +=[{"port":($port|tonumber), "protocol":"vmess", "settings":{"clients":[]}}]' |sponge $XCONF for xu in "${xuser[@]}" diff --git a/server-mttw.sh b/server-mttw.sh index 9ca57da..a4d89bd 100755 --- a/server-mttw.sh +++ b/server-mttw.sh @@ -70,6 +70,8 @@ fi if ! [ "${port}" -eq "${port}" ] 2>/dev/null; then >&2 echo "Port number must be numeric"; exit 1; fi XCONF=$xconf +# Remove existing port number if existing. +cat $XCONF |jq --arg port "${port}" 'del( .inbounds[] | select(.port == ($port|tonumber)) )' |sponge $XCONF cat $XCONF |jq --arg port "${port}" '.inbounds +=[{"port":($port|tonumber), "protocol":"vmess", "settings":{"clients":[]}}]' |sponge $XCONF for xu in "${xuser[@]}" diff --git a/server-ttpw.sh b/server-ttpw.sh index b224446..7de3783 100755 --- a/server-ttpw.sh +++ b/server-ttpw.sh @@ -52,6 +52,8 @@ fi if ! [ "${port}" -eq "${port}" ] 2>/dev/null; then >&2 echo "Port number must be numeric"; exit 1; fi XCONF=$xconf +# Remove existing port number if existing. +cat $XCONF |jq --arg port "${port}" 'del( .inbounds[] | select(.port == ($port|tonumber)) )' |sponge $XCONF cat $XCONF |jq --arg port "${port}" '.inbounds +=[{"port":($port|tonumber), "protocol":"trojan", "settings":{"clients":[]}}]' |sponge $XCONF for xu in "${xuser[@]}" diff --git a/server-ttt.sh b/server-ttt.sh index 550a378..92624ed 100755 --- a/server-ttt.sh +++ b/server-ttt.sh @@ -61,6 +61,8 @@ fi if ! [ "${port}" -eq "${port}" ] 2>/dev/null; then >&2 echo "Port number must be numeric"; exit 1; fi XCONF=$xconf +# Remove existing port number if existing. +cat $XCONF |jq --arg port "${port}" 'del( .inbounds[] | select(.port == ($port|tonumber)) )' |sponge $XCONF cat $XCONF |jq --arg port "${port}" '.inbounds +=[{"port":($port|tonumber), "protocol":"trojan", "settings":{"clients":[]}}]' |sponge $XCONF for xu in "${xuser[@]}" diff --git a/server-tttw.sh b/server-tttw.sh index 62513fa..1de6327 100755 --- a/server-tttw.sh +++ b/server-tttw.sh @@ -70,6 +70,8 @@ fi if ! [ "${port}" -eq "${port}" ] 2>/dev/null; then >&2 echo "Port number must be numeric"; exit 1; fi XCONF=$xconf +# Remove existing port number if existing. +cat $XCONF |jq --arg port "${port}" 'del( .inbounds[] | select(.port == ($port|tonumber)) )' |sponge $XCONF cat $XCONF |jq --arg port "${port}" '.inbounds +=[{"port":($port|tonumber), "protocol":"trojan", "settings":{"clients":[]}}]' |sponge $XCONF for xu in "${xuser[@]}"