From 89cce5715f5e6f304ae7bd39454660bd08ea4b6b Mon Sep 17 00:00:00 2001
From: Samuel Huang <samuelh2006@gmail.com>
Date: Tue, 10 Sep 2024 21:42:36 +1000
Subject: [PATCH] Initial REALITY support

---
 Dockerfile    | 2 +-
 addusertj.sh  | 2 +-
 run.sh        | 2 +-
 server-lsp.sh | 2 +-
 server-lst.sh | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1dfd2a6..875d9ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22-alpine3.20 AS builder
+FROM golang:1.23-alpine3.20 AS builder
 
 ARG XRAYVER='v1.8.24'
 
diff --git a/addusertj.sh b/addusertj.sh
index 6a81457..1365cc8 100755
--- a/addusertj.sh
+++ b/addusertj.sh
@@ -52,7 +52,7 @@ psw="${uopt[0]}"
 level="${uopt[1]}"
 email="${uopt[2]}"
 
-if [ -z "${uid}" ]; then
+if [ -z "${psw}" ]; then
     echo "Error: Undefined UID \"$user\"" >&2
     echo "Correct user format: user=<password>[:level:email]" >&2
     echo "Like: user=mypw:0:me@g.cn" >&2
diff --git a/run.sh b/run.sh
index 0dc14b0..1e3f6a5 100755
--- a/run.sh
+++ b/run.sh
@@ -181,7 +181,7 @@ if [ -n "${SVCMD}" ]; then
     fi
 
     if [ -n "${NGOPT}" ]; then
-        ngcmd="${DIR}server-nginx.sh"
+        ngcmd="${DIR}/server-nginx.sh"
         for ngopt in "${NGOPT[@]}"
         do
             ngcmd="${ngcmd} --ng-opt ${ngopt},$xopt"
diff --git a/server-lsp.sh b/server-lsp.sh
index 3e43a08..2623f06 100755
--- a/server-lsp.sh
+++ b/server-lsp.sh
@@ -68,7 +68,7 @@ do
 done
 
 # Network settings
-cat $XCONF |jq --arg port "${port}" \
+cat $XCONF |jq --arg port "${port}" --arg webpath "${webpath}" \
 '( .inbounds[] | select(.port == ($port|tonumber)) | .streamSettings ) += {"network":"splithttp","splithttpSettings":{"path":$webpath}} ' \
 |sponge $XCONF
 
diff --git a/server-lst.sh b/server-lst.sh
index 1ae84d1..136d4b0 100755
--- a/server-lst.sh
+++ b/server-lst.sh
@@ -116,7 +116,7 @@ do
 done
 
 # Network settings
-cat $XCONF |jq --arg port "${port}" \
+cat $XCONF |jq --arg port "${port}" --arg webpath "${webpath}" \
 '( .inbounds[] | select(.port == ($port|tonumber)) | .streamSettings ) += {"network":"splithttp","splithttpSettings":{"path":$webpath}} ' \
 |sponge $XCONF