From: Florian Eckert <fe@dev.tdt.de>
Date: Fri, 14 Feb 2020 08:12:31 +0000 (+0100)
Subject: luci.mk: move /tmp/luci-modulecache remove to package postinst script
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fpull%2F3631%2Fhead;p=oweals%2Fluci.git

luci.mk: move /tmp/luci-modulecache remove to package postinst script

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---

diff --git a/applications/luci-app-advanced-reboot/root/etc/uci-defaults/40_luci-advanced-reboot b/applications/luci-app-advanced-reboot/root/etc/uci-defaults/40_luci-advanced-reboot
deleted file mode 100644
index afe697389..000000000
--- a/applications/luci-app-advanced-reboot/root/etc/uci-defaults/40_luci-advanced-reboot
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -rf /var/luci-modulecache/;
-exit 0
diff --git a/applications/luci-app-attendedsysupgrade/root/etc/uci-defaults/40_luci-attendedsysupgrade b/applications/luci-app-attendedsysupgrade/root/etc/uci-defaults/40_luci-attendedsysupgrade
index ceebc6630..48ae4cc54 100755
--- a/applications/luci-app-attendedsysupgrade/root/etc/uci-defaults/40_luci-attendedsysupgrade
+++ b/applications/luci-app-attendedsysupgrade/root/etc/uci-defaults/40_luci-attendedsysupgrade
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-rm -rf /tmp/luci-modulecache/
 /etc/init.d/uhttpd restart
 /etc/init.d/rpcd reload
 
diff --git a/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy b/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy
deleted file mode 100644
index 2a2f1e7c4..000000000
--- a/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-rm -rf /var/luci-modulecache/
-exit 0
diff --git a/applications/luci-app-vpn-policy-routing/root/etc/uci-defaults/40_luci-vpn-policy-routing b/applications/luci-app-vpn-policy-routing/root/etc/uci-defaults/40_luci-vpn-policy-routing
deleted file mode 100644
index afe3de8c6..000000000
--- a/applications/luci-app-vpn-policy-routing/root/etc/uci-defaults/40_luci-vpn-policy-routing
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-rm -rf /var/luci-modulecache/;
-exit 0
diff --git a/luci.mk b/luci.mk
index fc02e84f7..2745797c1 100644
--- a/luci.mk
+++ b/luci.mk
@@ -226,6 +226,7 @@ define Package/$(PKG_NAME)/postinst
 [ -n "$${IPKG_INSTROOT}" ] || {$(foreach script,$(LUCI_DEFAULTS),
 	(. /etc/uci-defaults/$(script)) && rm -f /etc/uci-defaults/$(script))
 	rm -f /tmp/luci-indexcache
+	rm -rf /tmp/luci-modulecache/
 	exit 0
 }
 endef
@@ -233,6 +234,7 @@ else
 define Package/$(PKG_NAME)/postinst
 [ -n "$${IPKG_INSTROOT}" ] || {
 	rm -f /tmp/luci-indexcache
+	rm -rf /tmp/luci-modulecache/
 	exit 0
 }
 endef