frp-panel: 0.0.14-2

3 files changed, 8 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 997456507980..87b9f95c07bf 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.14
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/VaalaCat/frp-panel
 	install = frp-panel.install
 	arch = any
@@ -18,6 +18,6 @@ pkgbase = frp-panel
 	source = frp-panel@.service
 	sha256sums = 229c698e68b94ab19dbcfe042b7c66e4ebb8c64167accb9677a39c0f4e6bdd33
 	sha256sums = d909eac5b51218404824363ce35886fcd2a8065773ffecde8f64855a107369a0
-	sha256sums = a82a0d6fb9498a283137a90862a4bf65486368cfe88c25f7b901d4d914da7ca4
+	sha256sums = 430b38fb5de8ea2bdd03ef65d376b5aae7acad88cfffd5031d05b45e8ae1040b
 
 pkgname = frp-panel
diff --git a/PKGBUILD b/PKGBUILD
index ce04d1f2b186..20a839c1f690 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname="frp-panel"
 pkgver=0.0.14
-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}"
@@ -20,14 +20,14 @@ source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz
         "${pkgname}@.service")
 sha256sums=('229c698e68b94ab19dbcfe042b7c66e4ebb8c64167accb9677a39c0f4e6bdd33'
             'd909eac5b51218404824363ce35886fcd2a8065773ffecde8f64855a107369a0'
-            'a82a0d6fb9498a283137a90862a4bf65486368cfe88c25f7b901d4d914da7ca4')
+            '430b38fb5de8ea2bdd03ef65d376b5aae7acad88cfffd5031d05b45e8ae1040b')
 
 prepare() {
     cd "${pkgname}-${pkgver}"
 
     local file_setting="conf/settings.go"
     local n1 n2 element
-    for element in App Master Server DB; do
+    for element in App Master Server DB Client; 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
@@ -35,10 +35,7 @@ prepare() {
     sed -i 's|,`||' ../master.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"
+        grep -C1 -P "#APP_SECRET=|#MASTER_RPC_HOST=|#MASTER_RPC_PORT=|#MASTER_API_PORT=|#CLIENT_ID=|#CLIENT_SECRET=" ../master.env > "../${element}.env"
         sed -i '/--/d' "../${element}.env"
     done
 }
@@ -57,7 +54,7 @@ build() {
         -trimpath \
         -ldflags="$ldflags" \
         -o "${pkgname}" \
-        ./cmd/*.go
+        ./cmd/frpp/*.go
     
     ./"${pkgname}" completion zsh > ../completion.zsh
     ./"${pkgname}" completion bash > ../completion.bash
diff --git a/frp-panel@.service b/frp-panel@.service
index 32f9aa1f0a64..d9cb7e2911f4 100644
--- a/frp-panel@.service
+++ b/frp-panel@.service
@@ -10,7 +10,7 @@ RestartSec=5
 StartLimitInterval=0
 EnvironmentFile=-/etc/frp-panel/%i.env
 WorkingDirectory=/var/lib/frp-panel
-ExecStart=/usr/bin/frp-panel %i $START_PARAMS
+ExecStart=/usr/bin/frp-panel %i
 
 [Install]
 WantedBy=multi-user.target