From 57763140ef02e68504404fb27d696c35e075f251 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Sat, 17 Aug 2019 19:16:41 +0800
Subject: [PATCH] luci-app-serverchan: update

---
 README.md                                     |  4 +-
 package/cnsztl/luci-app-serverchan/Makefile   | 50 ++++---------------
 .../luasrc/controller/serverchan.lua          |  0
 .../luasrc/model/cbi/serverchan.lua           |  0
 .../view/serverchan/serverchan_status.htm     |  0
 .../root/etc/config/serverchan                |  0
 6 files changed, 11 insertions(+), 43 deletions(-)
 mode change 100755 => 100644 package/cnsztl/luci-app-serverchan/Makefile
 mode change 100755 => 100644 package/cnsztl/luci-app-serverchan/luasrc/controller/serverchan.lua
 mode change 100755 => 100644 package/cnsztl/luci-app-serverchan/luasrc/model/cbi/serverchan.lua
 mode change 100755 => 100644 package/cnsztl/luci-app-serverchan/luasrc/view/serverchan/serverchan_status.htm
 mode change 100755 => 100644 package/cnsztl/luci-app-serverchan/root/etc/config/serverchan

diff --git a/README.md b/README.md
index 6d942e2c99..f08bf1aff3 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ make -j1 V=s
 
 Package jsda: [jsda/packages2](https://github.com/jsda/packages2).<br/>
 luci-theme-netgearv2 source: [tracemouse/luci-theme-netgear](https://github.com/tracemouse/luci-theme-netgear).<br/>
-luci-app-serverchan source: [zxlhhyccc/luci-app-serverchan](https://github.com/zxlhhyccc/luci-app-serverchan).<br/>
+luci-app-serverchan source: [tty228/luci-app-serverchan](https://github.com/tty228/luci-app-serverchan).<br/>
 OpenAppFilter source: [destan19/OpenAppFilter](https://github.com/destan19/OpenAppFilter).<br/>
 luci-app-smartinfo source: [animefansxj/luci-app-smartinfo](https://github.com/animefansxj/luci-app-smartinfo).<br/>
 luci-app-koolproxy source: [Baozisoftware/luci-app-koolproxy](https://github.com/Baozisoftware/luci-app-koolproxy).<br/>
@@ -50,7 +50,7 @@ Package Openwrt-BBR: [anshi233/Openwrt-BBR](https://github.com/anshi233/Openwrt-
 simple-obfs source: [aa65535/openwrt-simple-obfs](https://github.com/aa65535/openwrt-simple-obfs).<br/>
 v2ray-plugin source: [honwen/openwrt-v2ray-plugin](https://github.com/honwen/openwrt-v2ray-plugin).<br/>
 Package zxlhhyccc: [zxlhhyccc/MY-lede](https://github.com/zxlhhyccc/MY-lede).<br/>
-luci-theme-argon source: [Meroser/luci-theme-argon](https://github.com/Meroser/luci-theme-argon).
+luci-theme-argonv3 source: [Meroser/luci-theme-argon](https://github.com/Meroser/luci-theme-argon).
 
 # License
 ### [GPL v3](https://www.gnu.org/licenses/gpl-3.0.html).
diff --git a/package/cnsztl/luci-app-serverchan/Makefile b/package/cnsztl/luci-app-serverchan/Makefile
old mode 100755
new mode 100644
index 57279accc4..17288e74e8
--- a/package/cnsztl/luci-app-serverchan/Makefile
+++ b/package/cnsztl/luci-app-serverchan/Makefile
@@ -5,54 +5,22 @@
 
 include $(TOPDIR)/rules.mk
 
+LUCI_TITLE:=LuCI support for serverchan
+LUCI_DEPENDS:=+iputils-arping +curl 
+LUCI_PKGARCH:=all
 PKG_NAME:=luci-app-serverchan
 PKG_VERSION:=1.0
 PKG_RELEASE:=40
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+include $(TOPDIR)/feeds/luci/luci.mk
 
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luci-app-serverchan
-	SECTION:=luci
-	CATEGORY:=LuCI
-	SUBMENU:=3. Applications
-	TITLE:=LuCI Support for serverchan on or off
-	DEPENDS:=+iputils-arping +curl
-endef
-
-define Package/luci-app-serverchan/description
-	LuCI support for serverchan
-endef
-
-define Build/Prepare
-endef
-
-define Build/Compile
-endef
-
-define Package/luci-app-serverchan/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci
-	cp -pR ./luasrc/* $(1)/usr/lib/lua/luci
-	$(INSTALL_DIR) $(1)/
-	cp -pR ./root/* $(1)/
-endef
-
-define Package/luci-app-serverchan/postinst
+define Package/$(PKG_NAME)/postinst
 #!/bin/sh
-	chmod 755 /etc/init.d/serverchan >/dev/null 2>&1
-	chmod 755 /usr/bin/serverchan/serverchan >/dev/null 2>&1
-	/etc/init.d/serverchan enable >/dev/null 2>&1
+chmod +X /etc/init.d/serverchan
+chmod +X /usr/bin/serverchan/serverchan
+/etc/init.d/serverchan enable >/dev/null 2>&1
 exit 0
 endef
 
-define Package/luci-app-serverchan/prerm
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-     /etc/init.d/serverchan disable
-     /etc/init.d/serverchan stop
-fi
-exit 0
-endef
+# call BuildPackage - OpenWrt buildroot signature
 
-$(eval $(call BuildPackage,luci-app-serverchan))
diff --git a/package/cnsztl/luci-app-serverchan/luasrc/controller/serverchan.lua b/package/cnsztl/luci-app-serverchan/luasrc/controller/serverchan.lua
old mode 100755
new mode 100644
diff --git a/package/cnsztl/luci-app-serverchan/luasrc/model/cbi/serverchan.lua b/package/cnsztl/luci-app-serverchan/luasrc/model/cbi/serverchan.lua
old mode 100755
new mode 100644
diff --git a/package/cnsztl/luci-app-serverchan/luasrc/view/serverchan/serverchan_status.htm b/package/cnsztl/luci-app-serverchan/luasrc/view/serverchan/serverchan_status.htm
old mode 100755
new mode 100644
diff --git a/package/cnsztl/luci-app-serverchan/root/etc/config/serverchan b/package/cnsztl/luci-app-serverchan/root/etc/config/serverchan
old mode 100755
new mode 100644