From 765b725701a403f0703a5df83b0e6efaa7202178 Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Sun, 31 Jul 2022 19:31:43 +0800
Subject: [PATCH] Move config files to luci package

---
 alist/Makefile                                |  18 +---------------
 alist/files/alist.uci-default                 |  20 ------------------
 luci-app-alist/Makefile                       |  16 +++++++++++---
 .../root/etc/alist}/data.db                   | Bin
 .../root/etc/config/alist                     |   0
 .../root/etc/init.d/alist                     |   0
 .../root/etc/uci-defaults/50_luci-alist       |   4 ----
 .../root/etc/uci-defaults/luci-alist          |  11 ++++++++++
 .../usr/share/rpcd/acl.d/luci-app-alist.json  |  11 ++++++++++
 9 files changed, 36 insertions(+), 44 deletions(-)
 delete mode 100755 alist/files/alist.uci-default
 rename {alist/files => luci-app-alist/root/etc/alist}/data.db (100%)
 rename alist/files/alist.config => luci-app-alist/root/etc/config/alist (100%)
 rename alist/files/alist.init => luci-app-alist/root/etc/init.d/alist (100%)
 delete mode 100755 luci-app-alist/root/etc/uci-defaults/50_luci-alist
 create mode 100755 luci-app-alist/root/etc/uci-defaults/luci-alist
 create mode 100644 luci-app-alist/root/usr/share/rpcd/acl.d/luci-app-alist.json

diff --git a/alist/Makefile b/alist/Makefile
index 6a18866..18d1c24 100644
--- a/alist/Makefile
+++ b/alist/Makefile
@@ -63,18 +63,6 @@ config ALIST_COMPRESS_UPX
 	default n
 endef
 
-define Package/$(PKG_NAME)/conffiles
-/etc/alist/
-/etc/config/alist
-endef
-
-define Package/$(PKG_NAME)/postinst
-#!/bin/sh
-if [ -z "$${IPKG_INSTROOT}" ]; then
-	[ -f /etc/uci-defaults/alist ] && /etc/uci-defaults/alist && rm -f /etc/uci-defaults/alist
-fi
-endef
-
 define Build/Prepare
 	$(call Build/Prepare/Default)
 	$(eval $(call Download,$(PKG_NAME)-web))
@@ -90,12 +78,8 @@ endif
 endef
 
 define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/etc/alist $(1)/etc/config $(1)/etc/init.d $(1)/etc/uci-defaults $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/alist $(1)/usr/bin
-	$(INSTALL_CONF) ./files/alist.config $(1)/etc/config/alist
-	$(INSTALL_BIN) ./files/alist.init $(1)/etc/init.d/alist
-	$(INSTALL_BIN) ./files/alist.uci-default $(1)/etc/uci-defaults/alist
-	$(INSTALL_CONF) ./files/data.db $(1)/etc/alist/data.db
 endef
 
 $(eval $(call GoBinPackage,$(PKG_NAME)))
diff --git a/alist/files/alist.uci-default b/alist/files/alist.uci-default
deleted file mode 100755
index ca64719..0000000
--- a/alist/files/alist.uci-default
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
-	delete ucitrack.@alist[-1]
-	add ucitrack alist
-	set ucitrack.@alist[-1].init=alist
-	commit ucitrack
-
-	delete firewall.alist
-	set firewall.alist=rule
-	set firewall.alist.name="alist"
-	set firewall.alist.target="ACCEPT"
-	set firewall.alist.src="wan"
-	set firewall.alist.proto="tcp"
-	set firewall.alist.dest_port="5244"
-	set firewall.alist.enabled="0"
-	commit firewall
-EOF
-
-exit 0
diff --git a/luci-app-alist/Makefile b/luci-app-alist/Makefile
index cdffa84..0dc0651 100644
--- a/luci-app-alist/Makefile
+++ b/luci-app-alist/Makefile
@@ -6,14 +6,24 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-alist
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.4
 PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI support for alist
 LUCI_DEPENDS:=+alist
-LUCI_PKGARCH:=all
+
+define Package/$(PKG_NAME)/conffiles
+/etc/alist
+endef
+
+define Package/$(PKG_NAME)/postinst
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-alist ) && rm -f /etc/uci-defaults/luci-alist
+	exit 0
+}
+endef
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature
-
diff --git a/alist/files/data.db b/luci-app-alist/root/etc/alist/data.db
similarity index 100%
rename from alist/files/data.db
rename to luci-app-alist/root/etc/alist/data.db
diff --git a/alist/files/alist.config b/luci-app-alist/root/etc/config/alist
similarity index 100%
rename from alist/files/alist.config
rename to luci-app-alist/root/etc/config/alist
diff --git a/alist/files/alist.init b/luci-app-alist/root/etc/init.d/alist
similarity index 100%
rename from alist/files/alist.init
rename to luci-app-alist/root/etc/init.d/alist
diff --git a/luci-app-alist/root/etc/uci-defaults/50_luci-alist b/luci-app-alist/root/etc/uci-defaults/50_luci-alist
deleted file mode 100755
index e0aedf7..0000000
--- a/luci-app-alist/root/etc/uci-defaults/50_luci-alist
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache*
-exit 0
diff --git a/luci-app-alist/root/etc/uci-defaults/luci-alist b/luci-app-alist/root/etc/uci-defaults/luci-alist
new file mode 100755
index 0000000..86f97ec
--- /dev/null
+++ b/luci-app-alist/root/etc/uci-defaults/luci-alist
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@alist[-1]
+	add ucitrack alist
+	set ucitrack.@alist[-1].init=alist
+	commit ucitrack
+EOF
+
+rm -rf /tmp/luci-*
+exit 0
diff --git a/luci-app-alist/root/usr/share/rpcd/acl.d/luci-app-alist.json b/luci-app-alist/root/usr/share/rpcd/acl.d/luci-app-alist.json
new file mode 100644
index 0000000..98ba942
--- /dev/null
+++ b/luci-app-alist/root/usr/share/rpcd/acl.d/luci-app-alist.json
@@ -0,0 +1,11 @@
+{
+	"luci-app-alist": {
+		"description": "Grant UCI access for luci-app-alist",
+		"read": {
+			"uci": [ "alist" ]
+		},
+		"write": {
+			"uci": [ "alist" ]
+		}
+	}
+}