v0.54.0

yanhao98 · Feb 1, 2024 · a2cf37d · a2cf37d
1 parent ca07bbc
commit a2cf37d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 27 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ RUN set -x && \
     curl --fail ${S6_OVERLAY_BASE_URL}/v${S6_OVERLAY_VERSION}/s6-overlay-`uname -m| sed 's/armv7l/armhf/g'`.tar.xz -SLo- | tar -C / -Jxpf - && \
     apt-get purge -y --auto-remove xz-utils
 
-COPY --from=fatedier/frps:v0.53.2 /usr/bin/frps /usr/bin/frps
+COPY --from=fatedier/frps:v0.54.0 /usr/bin/frps /usr/bin/frps
 COPY rootfs/ /
 COPY rootfs-s6-rc/ /
 

diff --git a/entry.sh b/entry.sh
@@ -13,8 +13,8 @@ print_title() {
 }
 
 if [ -z "${FRP_SUBDOMAIN_HOST}" ] || [ "${FRP_SUBDOMAIN_HOST}" = "domain.com" ]; then
-  echo "FRP_SUBDOMAIN_HOST is not set"
-  exit 1
+    echo "FRP_SUBDOMAIN_HOST is not set"
+    exit 1
 fi
 
 FRPS_VER=$(frps -v)
@@ -41,9 +41,9 @@ print_title "start nginx"
 # sleep 0.1
 print_title "start frps"
 exec /usr/bin/frps \
-  --bind_port="7000" \
-  --subdomain_host="${FRP_SUBDOMAIN_HOST}" \
-  --vhost_http_port="7080" \
-  --dashboard_port="7500" \
-  --dashboard_user="" \
-  --dashboard_pwd=""
+    --bind-port="7000" \
+    --subdomain-host="${FRP_SUBDOMAIN_HOST}" \
+    --vhost-http-port="7080" \
+    --dashboard-port="7500" \
+    --dashboard-user="" \
+    --dashboard-pwd=""
diff --git a/rootfs/usr/share/nginx/html/client.sh b/rootfs/usr/share/nginx/html/client.sh
@@ -8,15 +8,15 @@ version='REPLACE_VERSION'
 # Get options
 for i in "$@"; do
     case $i in
-    --local=*)
-        LOCAL="${i#*=}"
+        --local=*)
+            LOCAL="${i#*=}"
         ;;
-    -sd=* | --subdomain=*)
-        SUBDOMAIN="${i#*=}"
+        -sd=* | --subdomain=*)
+            SUBDOMAIN="${i#*=}"
         ;;
-    *)
-        # unknown option
-        echo "Unknown option: $i"
+        *)
+            # unknown option
+            echo "Unknown option: $i"
         ;;
     esac
 done
@@ -77,8 +77,8 @@ spaces_needed=$((69 - ${#url}))
 padding=$(printf '%*s' $spaces_needed)
 
 cat <<"EOF" | sed "s|URL|$url$padding|g"
-  ___________________________________________________________________________  
- /         _   _                                                             \ 
+  ___________________________________________________________________________
+ /         _   _                                                             \
 ||        | | (_)                                                            ||
 ||        | |_ _  __ _  ___ _ __                                             ||
 ||        | __| |/ _` |/ _ \ '__|                                            ||
@@ -94,15 +94,13 @@ cat <<"EOF" | sed "s|URL|$url$padding|g"
 ||   to stop frpc, please press ^C.                                          ||
 ||                                                                           ||
 ||   Enjoy!                                                                  ||
- \___________________________________________________________________________/ 
+ \___________________________________________________________________________/
 EOF
 
-
-
 ./frpc http \
-    --server_addr=${SERVER_IP} \
-    --server_port=7000 \
-    --local_ip="${LOCAL_IP}" \
-    --local_port="${LOCAL_PORT}" \
+    --server-addr=${SERVER_IP} \
+    --server-port=7000 \
+    --local-ip="${LOCAL_IP}" \
+    --local-port="${LOCAL_PORT}" \
     --sd="${SUBDOMAIN}" \
-    --proxy_name="${USERNAME}|${LOCAL}|${SUBDOMAIN}"
+    --proxy-name="${USERNAME}|${LOCAL}|${SUBDOMAIN}"
diff --git a/rootfs/usr/share/nginx/html/client.vbs b/rootfs/usr/share/nginx/html/client.vbs
@@ -112,7 +112,7 @@ Sub OutputCustomText()
 End Sub
 
 Sub startFrp ()
-  startCmd = "cmd /c "&tempFolder&"\frpc.exe http --server_addr="&SERVER_IP&" --server_port=7000 --proxy_name="&computerName&"-"&port&" --local_port="&port&" --sd="&computerName&"-"&port
+  startCmd = "cmd /c "&tempFolder&"\frpc.exe http --server-addr="&SERVER_IP&" --server-port=7000 --proxy-name="&computerName&"-"&port&" --local-port="&port&" --sd="&computerName&"-"&port
 
   ' #############################
   Set objFile = FSO.CreateTextFile(tempFolder&"\start.bat", True)