From 1b5a015c96ad28d18e8f447a80ec9bcfdf62748d Mon Sep 17 00:00:00 2001
From: lean <coolsnowwolf@gmail.com>
Date: Mon, 16 Mar 2020 13:53:28 +0800
Subject: [PATCH] luci-app-ssr-plus: update cron sh

---
 package/lean/luci-app-ssr-plus/Makefile            |  2 +-
 .../luasrc/model/cbi/shadowsocksr/servers.lua      | 14 ++++++--------
 .../luci-app-ssr-plus/root/etc/init.d/shadowsocksr |  6 +++---
 .../root/usr/share/shadowsocksr/ssrplusupdate.sh   |  6 ++++++
 .../root/usr/share/shadowsocksr/update.lua         |  2 +-
 5 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100755 package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/ssrplusupdate.sh

diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile
index 2253776ac..72ae55d2f 100644
--- a/package/lean/luci-app-ssr-plus/Makefile
+++ b/package/lean/luci-app-ssr-plus/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=167
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua
index bb0d7dcb2..7a5317010 100644
--- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua
+++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua
@@ -70,8 +70,7 @@ uci:delete_all("shadowsocksr", "servers", function(s)
 end)
 uci:save("shadowsocksr") 
 uci:commit("shadowsocksr")
-luci.sys.init.stop("shadowsocksr")
-luci.sys.init.start("shadowsocksr")
+luci.sys.exec("/etc/init.d/shadowsocksr restart")
 luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "servers"))
 return
 end
@@ -115,14 +114,13 @@ o.template="shadowsocksr/ping"
 o.width="10%"
 
 
-o = s:option(Button,"apply_node",translate("Apply"))
-o.inputstyle = "apply"
-o.write = function(self, section)
+node = s:option(Button,"apply_node",translate("Apply"))
+node.inputstyle = "apply"
+node.write = function(self, section)
   ucic:set("shadowsocksr", '@global[0]', 'global_server', section)
   ucic:save("shadowsocksr") 
   ucic:commit("shadowsocksr")
-  luci.sys.init.stop("shadowsocksr")
-  luci.sys.init.start("shadowsocksr")
+  luci.sys.exec("/etc/init.d/shadowsocksr restart")
   luci.http.redirect(luci.dispatcher.build_url("admin", "services", "shadowsocksr", "client"))
 end
 
@@ -134,4 +132,4 @@ end
 
 m:append(Template("shadowsocksr/server_list"))
 
-return m
+return m
\ No newline at end of file
diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
index 0941d63b8..03394f140 100755
--- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
+++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
@@ -49,8 +49,8 @@ uci_get_by_cfgid() {
 add_cron() {
 	sed -i '/shadowsocksr/d' $CRON_FILE
 	sed -i '/ssrplus.log/d' $CRON_FILE && echo '0 1 * * * echo "" > /tmp/ssrplus.log' >>$CRON_FILE
-	[ $(uci_get_by_type server_subscribe auto_update 0) -eq 1 ] && echo "0 $(uci_get_by_type server_subscribe auto_update_time) * * * /usr/bin/lua /usr/share/shadowsocksr/subscribe.lua" >>$CRON_FILE
-	[ $(uci_get_by_type server_subscribe auto_update 0) -eq 1 ] && echo "0 5 * * * /usr/bin/lua /usr/share/shadowsocksr/update.lua" >>$CRON_FILE
+	[ $(uci_get_by_type server_subscribe auto_update 0) -eq 1 ] && echo "0 $(uci_get_by_type server_subscribe auto_update_time) * * * /usr/share/shadowsocksr/ssrplusupdate.sh" >>$CRON_FILE
+
 	crontab $CRON_FILE
 }
 
@@ -197,7 +197,7 @@ start_rules() {
 	if [ $dports == "1" ]; then
 		proxyport=" "
 	else
-		proxyport="-m multiport --dports 22,53,587,465,995,993,143,80,443,5222"
+		proxyport="-m multiport --dports 22,53,587,465,995,993,143,80,443"
 	fi
 	/usr/bin/ssr-rules \
 	-s "$server" \
diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/ssrplusupdate.sh b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/ssrplusupdate.sh
new file mode 100755
index 000000000..5db73ff88
--- /dev/null
+++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/ssrplusupdate.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+/usr/bin/lua /usr/share/shadowsocksr/update.lua
+/usr/bin/lua /usr/share/shadowsocksr/subscribe.lua
+sleep 10
+/etc/init.d/shadowsocksr restart
\ No newline at end of file
diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua
index 639417da9..28da8ad65 100644
--- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua
+++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua
@@ -94,4 +94,4 @@ else
 end
 end
 
-luci.sys.call("/etc/init.d/dnsmasq restart")
+luci.sys.call("/etc/init.d/dnsmasq reload")