update to 4.8.0

heiher · Feb 14, 2023 · ae3d3de · ae3d3de
1 parent bdac9de
commit ae3d3de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,14 +1,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hev-fsh
-PKG_VERSION:=4.7.2
+PKG_VERSION:=4.8.0
 PKG_RELEASE:=1
 PKG_USE_MIPS16:=0
 PKG_BUILD_PARALLEL:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/heiher/hev-fsh.git
-PKG_SOURCE_VERSION:=1da295d155bd48a1cedf32a2bd0b9b001cacdbda
+PKG_SOURCE_VERSION:=1749c33b509a4774ccb845c2520cb39fac4a188e
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)

diff --git a/files/fsh-srv.init b/files/fsh-srv.init
@@ -15,6 +15,7 @@ USE_PROCD=1
 start_hev_fsh_srv() {
 	addr=$(uci get fsh.srv.addr)
 	port=$(uci get fsh.srv.port)
+	file=$(uci get fsh.srv.tokens)
 
 	procd_open_instance
 	procd_set_param respawn
@@ -25,6 +26,9 @@ start_hev_fsh_srv() {
 		procd_append_param limits core="unlimited"
 	}
 	procd_set_param command /usr/bin/fsh -s
+	[ -n "${file}" ] && [ -e "${file}" ] && {
+		procd_append_param command -a ${file}
+	}
 	procd_append_param command ${addr}:${port}
 	procd_close_instance
 }

diff --git a/files/fsh.config b/files/fsh.config
@@ -1,6 +1,7 @@
 config fsh 'srv'
     option 'addr' '[::]'
     option 'port' '6339'
+    option 'tokens' '/etc/fsh'
 
 config fsh 'fwd'
     option 'addr' '127.0.0.1'