update service file.

4 files changed, 15 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed0024d3865b..80bd894ff1d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = stairspeedtest-reborn-bin
 	pkgdesc = Proxy performance batch tester based on Shadowsocks(R) and V2Ray
 	pkgver = 0.7.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/tindy2013/stairspeedtest-reborn
 	arch = x86_64
 	arch = armv7h
@@ -13,8 +13,8 @@ pkgbase = stairspeedtest-reborn-bin
 	options = !strip
 	source = stairspeedtest-webgui.service
 	source = stairspeedtest-webserver.service
-	sha256sums = 73fbee4d1cef4a127f9be7e0c0a1ce49244834648f5fc2b35645bc9fd102d32d
-	sha256sums = c57c8794e739a4671e0dec0f801e2954313f15e9acffcfc50f5ec46c7531b77b
+	sha256sums = d1e7fdf0317c3a621232f046d543706f98aae26b7ed87be7b59bb5c9a4d3858e
+	sha256sums = 0c3ab114616693a7ea6ad0abefec4f6c5b1da6c44735b16a3ea0809467f49900
 	source_x86_64 = https://github.com/tindy2013/stairspeedtest-reborn/releases/download/v0.7.1/stairspeedtest_reborn_linux64.tar.gz
 	sha256sums_x86_64 = 236f328f7dbeaa1a63e59aa62c9ee8fdda30ebfdc6379edf5e1f8f191a120c6c
 	source_armv7h = https://github.com/tindy2013/stairspeedtest-reborn/releases/download/v0.7.1/stairspeedtest_reborn_armhf.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 4d2301f3e12e..064c1deef837 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=stairspeedtest
 pkgname=${_pkgname}-reborn-bin
 pkgver=0.7.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Proxy performance batch tester based on Shadowsocks(R) and V2Ray"
 arch=('x86_64' 'armv7h' 'aarch64')
 url="https://github.com/tindy2013/${_pkgname}-reborn"
@@ -14,11 +14,11 @@ conflicts=('stairspeedtest')
 options=(!strip)
 source=(${_pkgname}-webgui.service
         ${_pkgname}-webserver.service)
-source_x86_64=("https://github.com/tindy2013/${_pkgname}-reborn/releases/download/v${pkgver}/stairspeedtest_reborn_linux64.tar.gz")
-source_armv7h=("https://github.com/tindy2013/${_pkgname}-reborn/releases/download/v${pkgver}/stairspeedtest_reborn_armhf.tar.gz")
-source_aarch64=("https://github.com/tindy2013/${_pkgname}-reborn/releases/download/v${pkgver}/stairspeedtest_reborn_arm64.tar.gz")
-sha256sums=('73fbee4d1cef4a127f9be7e0c0a1ce49244834648f5fc2b35645bc9fd102d32d'
-            'c57c8794e739a4671e0dec0f801e2954313f15e9acffcfc50f5ec46c7531b77b')
+source_x86_64=("${url}/releases/download/v${pkgver}/${_pkgname}_reborn_linux64.tar.gz")
+source_armv7h=("${url}/releases/download/v${pkgver}/${_pkgname}_reborn_armhf.tar.gz")
+source_aarch64=("${url}/releases/download/v${pkgver}/${_pkgname}_reborn_arm64.tar.gz")
+sha256sums=('d1e7fdf0317c3a621232f046d543706f98aae26b7ed87be7b59bb5c9a4d3858e'
+            '0c3ab114616693a7ea6ad0abefec4f6c5b1da6c44735b16a3ea0809467f49900')
 sha256sums_x86_64=('236f328f7dbeaa1a63e59aa62c9ee8fdda30ebfdc6379edf5e1f8f191a120c6c')
 sha256sums_armv7h=('7e854bc19b23d9e4352ce6cf724a356eb5ebe310ebda1ba2c2d7f48e9b489a54')
 sha256sums_aarch64=('8b9398f01eb5c8ef5b28b237754cbf94cbc26123fb6b481aa3ea1599a26e1253')
@@ -37,5 +37,5 @@ package() {
   install -Dm644 "${srcdir}"/${_pkgname}-webserver.service  ./usr/lib/systemd/system/${_pkgname}-webserver.service
   
   mkdir -pv ./usr/bin
-  ln -vsf /opt/subconverter/stairspeedtest ./usr/bin/stairspeedtest
+  ln -vsf /opt/${_pkgname}/stairspeedtest ./usr/bin/stairspeedtest
 }
diff --git a/stairspeedtest-webgui.service b/stairspeedtest-webgui.service
index 50aa84761dd7..661435921507 100644
--- a/stairspeedtest-webgui.service
+++ b/stairspeedtest-webgui.service
@@ -3,12 +3,8 @@ Description=Stair Speedtest Web GUI service
 
 [Service]
 User=root
-WorkingDirectory=/opt/stairspeedtest
-Type=exec
-ExecStart=/opt/stairspeedtest/tools/gui/websocketd --port=65430 --maxforks=1 --staticdir=tools/gui ./stairspeedtest /rpc
-KillMode=process
-KillSignal=SIGINT
-TimeoutStopSec=5min
+Type=simple
+ExecStart=/opt/stairspeedtest/webgui.sh
 
 [Install]
 WantedBy=multi-user.target
diff --git a/stairspeedtest-webserver.service b/stairspeedtest-webserver.service
index 97e12bc1628e..5257cc997286 100644
--- a/stairspeedtest-webserver.service
+++ b/stairspeedtest-webserver.service
@@ -2,13 +2,9 @@
 Description=Stair Speedtest Web service
 
 [Service]
-User=github-actions
-WorkingDirectory=/opt/stairspeedtest
-Type=exec
-ExecStart=/opt/stairspeedtest/stairspeedtest /web
-KillMode=process
-KillSignal=SIGINT
-TimeoutStopSec=5min
+User=root
+Type=simple
+ExecStart=/opt/stairspeedtest/webserver.sh
 
 [Install]
 WantedBy=multi-user.target