frp-panel: 0.0.11-2

4 files changed, 10 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9d374f9d8e57..3bc0fb666bd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = frp-panel
 	pkgdesc = A multi node frp webui and for frp server and client management
 	pkgver = 0.0.11
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/VaalaCat/frp-panel
 	install = frp-panel.install
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 8917ac2d9fd4..16ba42e7d663 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname="frp-panel"
 pkgver=0.0.11
-pkgrel=1
+pkgrel=2
 pkgdesc="A multi node frp webui and for frp server and client management"
 arch=("any")
 url="https://github.com/VaalaCat/${pkgname}"
@@ -26,22 +26,20 @@ prepare() {
     cd "${pkgname}-${pkgver}"
 
     local file_setting="conf/settings.go"
-    local n1 n2
+    local n1 n2 element
     for element in App Master Server DB; do
         n1=$(grep -nP "^\s${element} struct \{" "$file_setting" | awk -F: '{print $1}')
         n2=$(grep -nP "env-prefix:\"${element^^}_\"" "$file_setting" | awk -F: '{print $1}')
         awk -v n1="${n1}" -v n2="${n2}" -F '"' '{if(NR>n1 && NR<n2){print "##"$3" "$4","$5" "$6"\n#""'${element^^}_'"$2"=\"\"\n"}}' "$file_setting" >> master.env
     done
 
-    grep -A1 -B1 -P "#APP_SECRET=|#MASTER_RPC_HOST=|#MASTER_RPC_PORT=|#MASTER_API_PORT=" master.env > client.env
-    echo "## For client nodes, need append clientSecret and clientID after start command, such as: " >> server.env
-    echo "START_PARAMS=\"-s 'b16379b1-349c-421f-83b2-78c45b5c6de2' -i 'node.c.1'\"" >> client.env
-    echo "START_PARAMS=\"\"" >> client.env
-
-    grep -A1 -B1 -P "#APP_SECRET=|#MASTER_RPC_HOST=|#MASTER_RPC_PORT=|#MASTER_API_PORT=" master.env > server.env
-    echo "## For server nodes, need append clientSecret and clientID after start command, such as: " >> server.env
-    echo "#START_PARAMS=\"-s 'b16379b1-349c-421f-83b2-78c45b5c6de2' -i default\"" >> server.env
-    echo "START_PARAMS=\"\"" >> server.env
+    for element in client server; do
+        grep -C1 -P "#APP_SECRET=|#MASTER_RPC_HOST=|#MASTER_RPC_PORT=|#MASTER_API_PORT=" master.env > "${element}.env"
+        echo "## For ${element} nodes, need append clientSecret and clientID after start command, such as: " >> "${element}.env"
+        echo "#START_PARAMS=\"-s 'b16379b1-349c-421f-83b2-78c45b5c6de2' -i '${element}'\"" >> "${element}.env"
+        echo "START_PARAMS=\"\"" >> "${element}.env"
+        sed -i '/--/d' "${element}.env"
+    done
 }
 
 build() {
diff --git a/client.env b/client.env
deleted file mode 100644
index ac1bd7d970e5..000000000000
--- a/client.env
+++ /dev/null
@@ -1,16 +0,0 @@
-## For client nodes, such as: START_PARAMS="-s 'b16379b1-349c-421f-83b2-78c45b5c6de2' -i 'node.c.1'"
-## 对client节点，形如: START_PARAMS="-s 'b16379b1-349c-421f-83b2-78c45b5c6de2' -i 'node.c.1'"
-
-# Usage:
-#   frp-panel client [-s client_secret] [-i client_id] [-a app_secret] [-r rpc_host] [-c rpc_port] [-p api_port] [flags]
-
-# Flags:
-#   -p, --api-port int        api port
-#   -e, --api-scheme string   api scheme
-#   -a, --app string          app secret
-#   -i, --id string           client id (default "pkg")
-#   -r, --rpc string          rpc host
-#   -c, --rpc-port int        rpc port
-#   -s, --secret string       client secret
-
-START_PARAMS=""
diff --git a/server.env b/server.env
deleted file mode 100644
index 0d4d70e5a9e1..000000000000
--- a/server.env
+++ /dev/null
@@ -1,16 +0,0 @@
-## For client nodes, such as: START_PARAMS="-s 'b16379b1-349c-421f-83b2-78c45b5c6de2' -i default"
-## 对client节点，形如: START_PARAMS="-s 'b16379b1-349c-421f-83b2-78c45b5c6de2' -i default"
-
-# Usage:
-#   frp-panel server [-s client_secret] [-i client_id] [-a app_secret] [-r rpc_host] [-c rpc_port] [-p api_port] [flags]
-
-# Flags:
-#   -p, --api-port int        api port
-#   -e, --api-scheme string   api scheme
-#   -a, --app string          app secret
-#   -i, --id string           client id (default "pkg")
-#   -r, --rpc string          rpc host
-#   -c, --rpc-port int        rpc port
-#   -s, --secret string       client secret
-
-START_PARAMS=""