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

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

41 files changed, 11 insertions, 102 deletions

diff --git a/applications/luci-app-adblock/root/etc/uci-defaults/40_luci-adblock b/applications/luci-app-adblock/root/etc/uci-defaults/40_luci-adblock
deleted file mode 100755
index d7bfee271d..0000000000
--- a/applications/luci-app-adblock/root/etc/uci-defaults/40_luci-adblock
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
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
index e1a8f1e307..afe697389f 100644
--- 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
@@ -1,5 +1,4 @@
 #!/bin/sh
 
-rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache;
+rm -rf /var/luci-modulecache/;
 exit 0
-
diff --git a/applications/luci-app-ahcp/root/etc/uci-defaults/40_luci-ahcp b/applications/luci-app-ahcp/root/etc/uci-defaults/40_luci-ahcp
index f2b2487cac..c0270a33c6 100755
--- a/applications/luci-app-ahcp/root/etc/uci-defaults/40_luci-ahcp
+++ b/applications/luci-app-ahcp/root/etc/uci-defaults/40_luci-ahcp
@@ -7,5 +7,4 @@ uci -q batch <<-EOF >/dev/null
 	commit ucitrack
 EOF
 
-rm -f /tmp/luci-indexcache
 exit 0
diff --git a/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2 b/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2
index a6b485a5c8..97ea9ca27c 100755
--- a/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2
+++ b/applications/luci-app-aria2/root/etc/uci-defaults/40_luci-aria2
@@ -14,5 +14,4 @@ if [ ."$(uci -q get aria2.main)" != ."aria2" ]; then
 	EOF
 fi
 
-rm -f /tmp/luci-indexcache
 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 1b890c0cbb..ceebc6630f 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,6 @@
 #!/bin/sh
 
-rm -rf /tmp/luci-indexcache /tmp/luci-modulecache/
+rm -rf /tmp/luci-modulecache/
 /etc/init.d/uhttpd restart
 /etc/init.d/rpcd reload
 
diff --git a/applications/luci-app-banip/root/etc/uci-defaults/40_luci-banip b/applications/luci-app-banip/root/etc/uci-defaults/40_luci-banip
deleted file mode 100755
index d7bfee271d..0000000000
--- a/applications/luci-app-banip/root/etc/uci-defaults/40_luci-banip
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/applications/luci-app-bcp38/root/etc/uci-defaults/60_luci-bcp38 b/applications/luci-app-bcp38/root/etc/uci-defaults/60_luci-bcp38
deleted file mode 100755
index d7bfee271d..0000000000
--- a/applications/luci-app-bcp38/root/etc/uci-defaults/60_luci-bcp38
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/applications/luci-app-dcwapd/root/etc/uci-defaults/60_luci-dcwapd b/applications/luci-app-dcwapd/root/etc/uci-defaults/60_luci-dcwapd
deleted file mode 100644
index c52d3c26b3..0000000000
--- a/applications/luci-app-dcwapd/root/etc/uci-defaults/60_luci-dcwapd
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exit 0
diff --git a/applications/luci-app-ddns/root/etc/uci-defaults/40_luci-ddns b/applications/luci-app-ddns/root/etc/uci-defaults/40_luci-ddns
index a82c1f9ac6..9923e8677e 100755
--- a/applications/luci-app-ddns/root/etc/uci-defaults/40_luci-ddns
+++ b/applications/luci-app-ddns/root/etc/uci-defaults/40_luci-ddns
@@ -6,5 +6,4 @@ uci -q batch <<-EOF >/dev/null
 	commit ucitrack
 EOF
 
-rm -f /tmp/luci-indexcache
 return 0
diff --git a/applications/luci-app-dnscrypt-proxy/root/etc/uci-defaults/60_luci-dnscrypt-proxy b/applications/luci-app-dnscrypt-proxy/root/etc/uci-defaults/60_luci-dnscrypt-proxy
deleted file mode 100755
index d7bfee271d..0000000000
--- a/applications/luci-app-dnscrypt-proxy/root/etc/uci-defaults/60_luci-dnscrypt-proxy
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/applications/luci-app-dump1090/root/etc/uci-defaults/40_luci-dump1090 b/applications/luci-app-dump1090/root/etc/uci-defaults/40_luci-dump1090
deleted file mode 100644
index d7bfee271d..0000000000
--- a/applications/luci-app-dump1090/root/etc/uci-defaults/40_luci-dump1090
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/applications/luci-app-dynapoint/root/etc/uci-defaults/40_luci-dynapoint b/applications/luci-app-dynapoint/root/etc/uci-defaults/40_luci-dynapoint
index 7287ccd420..0ffa34d762 100644
--- a/applications/luci-app-dynapoint/root/etc/uci-defaults/40_luci-dynapoint
+++ b/applications/luci-app-dynapoint/root/etc/uci-defaults/40_luci-dynapoint
@@ -8,6 +8,4 @@ uci -q batch <<-EOF >/dev/null
 	commit dynapoint
 EOF
 
-rm -f /tmp/luci-indexcache
 exit 0
-
diff --git a/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd b/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd
index f81c941e83..7cecf27461 100644
--- a/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd
+++ b/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd
@@ -15,5 +15,4 @@ uci set fwknopd.@config[0].ENABLE_IPT_FORWARDING='y'
 uci set fwknopd.@config[0].ENABLE_NAT_DNS='y'
 
 uci commit fwknopd
-rm -f /tmp/luci-indexcache
 exit 0
diff --git a/applications/luci-app-hd-idle/root/etc/uci-defaults/40_luci-hd_idle b/applications/luci-app-hd-idle/root/etc/uci-defaults/40_luci-hd_idle
deleted file mode 100755
index d7bfee271d..0000000000
--- a/applications/luci-app-hd-idle/root/etc/uci-defaults/40_luci-hd_idle
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
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
index a1ecfcea24..2a2f1e7c4b 100644
--- 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
@@ -1,3 +1,3 @@
 #!/bin/sh
-rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache;
+rm -rf /var/luci-modulecache/
 exit 0
diff --git a/applications/luci-app-minidlna/root/etc/uci-defaults/40_luci-minidlna b/applications/luci-app-minidlna/root/etc/uci-defaults/40_luci-minidlna
index 47570307ba..8a73b955a5 100755
--- a/applications/luci-app-minidlna/root/etc/uci-defaults/40_luci-minidlna
+++ b/applications/luci-app-minidlna/root/etc/uci-defaults/40_luci-minidlna
@@ -6,5 +6,4 @@ uci -q batch <<-EOF >/dev/null
 	commit ucitrack
 EOF
 
-rm -f /tmp/luci-indexcache
 exit 0
diff --git a/applications/luci-app-mjpg-streamer/root/etc/uci-defaults/40_luci-mjpg-streamer b/applications/luci-app-mjpg-streamer/root/etc/uci-defaults/40_luci-mjpg-streamer
deleted file mode 100755
index d7bfee271d..0000000000
--- a/applications/luci-app-mjpg-streamer/root/etc/uci-defaults/40_luci-mjpg-streamer
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/applications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan3 b/applications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan3
index 150ea5a3f1..528415f5a7 100755
--- a/applications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan3
+++ b/applications/luci-app-mwan3/root/etc/uci-defaults/60_luci-mwan3
@@ -15,7 +15,4 @@ uci -q get mwan3.globals >/dev/null || {
 	uci commit mwan3
 }
 
-# remove LuCI cache
-rm -rf /tmp/luci-indexcache /tmp/luci-modulecache
-
 exit 0
diff --git a/applications/luci-app-nextdns/root/etc/uci-defaults/60_luci-nextdns b/applications/luci-app-nextdns/root/etc/uci-defaults/60_luci-nextdns
deleted file mode 100755
index d7bfee271d..0000000000
--- a/applications/luci-app-nextdns/root/etc/uci-defaults/60_luci-nextdns
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/applications/luci-app-nlbwmon/root/etc/uci-defaults/40_luci-nlbwmon b/applications/luci-app-nlbwmon/root/etc/uci-defaults/40_luci-nlbwmon
deleted file mode 100644
index d7bfee271d..0000000000
--- a/applications/luci-app-nlbwmon/root/etc/uci-defaults/40_luci-nlbwmon
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/applications/luci-app-noddos/root/etc/uci-defaults/40_luci-noddos b/applications/luci-app-noddos/root/etc/uci-defaults/40_luci-noddos
deleted file mode 100644
index 5225b63a8e..0000000000
--- a/applications/luci-app-noddos/root/etc/uci-defaults/40_luci-noddos
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2017 Steven Hessing (steven.hessing@live.com)
-# This is free software, licensed under the GNU General Public License v3
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/applications/luci-app-nut/root/etc/uci-defaults/40_luci-nut b/applications/luci-app-nut/root/etc/uci-defaults/40_luci-nut
index 621f6a6a38..45a1fbb431 100755
--- a/applications/luci-app-nut/root/etc/uci-defaults/40_luci-nut
+++ b/applications/luci-app-nut/root/etc/uci-defaults/40_luci-nut
@@ -18,5 +18,4 @@ if [ "$version" = "2.7.4" ] && [ "$release" -lt 8 ]; then
 EOF
 fi
 
-rm -f /tmp/luci-indexcache
 exit 0
diff --git a/applications/luci-app-olsr/root/etc/uci-defaults/40_luci-olsr b/applications/luci-app-olsr/root/etc/uci-defaults/40_luci-olsr
index 63c01e4a2c..a941abd54c 100755
--- a/applications/luci-app-olsr/root/etc/uci-defaults/40_luci-olsr
+++ b/applications/luci-app-olsr/root/etc/uci-defaults/40_luci-olsr
@@ -10,5 +10,4 @@ uci -q batch <<-EOF >/dev/null
 	commit ucitrack
 EOF
 
-rm -f /tmp/luci-indexcache
 exit 0
diff --git a/applications/luci-app-p910nd/root/etc/uci-defaults/40_luci-p910nd b/applications/luci-app-p910nd/root/etc/uci-defaults/40_luci-p910nd
index 80f6d62fa2..d1b629fdee 100755
--- a/applications/luci-app-p910nd/root/etc/uci-defaults/40_luci-p910nd
+++ b/applications/luci-app-p910nd/root/etc/uci-defaults/40_luci-p910nd
@@ -7,5 +7,4 @@ uci -q batch <<-EOF >/dev/null
 	commit ucitrack
 EOF
 
-rm -f /tmp/luci-indexcache
 exit 0
diff --git a/applications/luci-app-pagekitec/root/etc/uci-defaults/40_luci-pagekitec b/applications/luci-app-pagekitec/root/etc/uci-defaults/40_luci-pagekitec
deleted file mode 100755
index d7bfee271d..0000000000
--- a/applications/luci-app-pagekitec/root/etc/uci-defaults/40_luci-pagekitec
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/applications/luci-app-polipo/root/etc/uci-defaults/40_luci-polipo b/applications/luci-app-polipo/root/etc/uci-defaults/40_luci-polipo
index 0c570630da..60af421389 100755
--- a/applications/luci-app-polipo/root/etc/uci-defaults/40_luci-polipo
+++ b/applications/luci-app-polipo/root/etc/uci-defaults/40_luci-polipo
@@ -7,5 +7,4 @@ uci -q batch <<-EOF >/dev/null
 	commit ucitrack
 EOF
 
-rm -f /tmp/luci-indexcache
 exit 0
diff --git a/applications/luci-app-privoxy/root/etc/uci-defaults/40_luci-privoxy b/applications/luci-app-privoxy/root/etc/uci-defaults/40_luci-privoxy
index 3405479b54..884f7e5572 100755
--- a/applications/luci-app-privoxy/root/etc/uci-defaults/40_luci-privoxy
+++ b/applications/luci-app-privoxy/root/etc/uci-defaults/40_luci-privoxy
@@ -7,6 +7,4 @@ uci -q batch <<-EOF >/dev/null
 	commit ucitrack
 EOF
 
-rm -f /tmp/luci-indexcache
-
 exit 0
diff --git a/applications/luci-app-radicale/root/etc/uci-defaults/40_luci-radicale b/applications/luci-app-radicale/root/etc/uci-defaults/40_luci-radicale
index 333ca65f45..a5064b520f 100755
--- a/applications/luci-app-radicale/root/etc/uci-defaults/40_luci-radicale
+++ b/applications/luci-app-radicale/root/etc/uci-defaults/40_luci-radicale
@@ -7,6 +7,4 @@ uci -q batch <<-EOF >/dev/null
 	commit ucitrack
 EOF
 
-rm -f /tmp/luci-indexcache
-
 exit 0
diff --git a/applications/luci-app-shadowsocks-libev/root/etc/uci-defaults/40_luci-shadowsocks-libev b/applications/luci-app-shadowsocks-libev/root/etc/uci-defaults/40_luci-shadowsocks-libev
index 10e1c702ff..f74c13db4c 100644
--- a/applications/luci-app-shadowsocks-libev/root/etc/uci-defaults/40_luci-shadowsocks-libev
+++ b/applications/luci-app-shadowsocks-libev/root/etc/uci-defaults/40_luci-shadowsocks-libev
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-rm -f /tmp/luci-indexcache
 mkdir -p /etc/shadowsocks-libev
 /etc/init.d/rpcd reload
 exit 0
diff --git a/applications/luci-app-shairplay/root/etc/uci-defaults/40_luci-shairplay b/applications/luci-app-shairplay/root/etc/uci-defaults/40_luci-shairplay
deleted file mode 100644
index d7bfee271d..0000000000
--- a/applications/luci-app-shairplay/root/etc/uci-defaults/40_luci-shairplay
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/applications/luci-app-simple-adblock/root/etc/uci-defaults/40_luci-simple-adblock b/applications/luci-app-simple-adblock/root/etc/uci-defaults/40_luci-simple-adblock
index 97bc9fbee0..64b349e689 100644
--- a/applications/luci-app-simple-adblock/root/etc/uci-defaults/40_luci-simple-adblock
+++ b/applications/luci-app-simple-adblock/root/etc/uci-defaults/40_luci-simple-adblock
@@ -4,5 +4,4 @@ uci -q batch <<-EOF >/dev/null
 	commit ucitrack
 EOF
 
-rm -f /tmp/luci-indexcache
 exit 0
diff --git a/applications/luci-app-statistics/root/etc/uci-defaults/40_luci-statistics b/applications/luci-app-statistics/root/etc/uci-defaults/40_luci-statistics
index 28e35298a2..c05cb82af0 100755
--- a/applications/luci-app-statistics/root/etc/uci-defaults/40_luci-statistics
+++ b/applications/luci-app-statistics/root/etc/uci-defaults/40_luci-statistics
@@ -12,5 +12,4 @@ EOF
 [ -x /usr/sbin/httpd ] && [ ! -h /www/rrdimg ] && \
 	ln -s /tmp/rrdimg /www/rrdimg
 
-rm -f /tmp/luci-indexcache
 exit 0
diff --git a/applications/luci-app-travelmate/root/etc/uci-defaults/40_luci-travelmate b/applications/luci-app-travelmate/root/etc/uci-defaults/40_luci-travelmate
deleted file mode 100755
index d7bfee271d..0000000000
--- a/applications/luci-app-travelmate/root/etc/uci-defaults/40_luci-travelmate
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/applications/luci-app-udpxy/root/etc/uci-defaults/40_luci-udpxy b/applications/luci-app-udpxy/root/etc/uci-defaults/40_luci-udpxy
deleted file mode 100644
index d7bfee271d..0000000000
--- a/applications/luci-app-udpxy/root/etc/uci-defaults/40_luci-udpxy
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/applications/luci-app-unbound/root/etc/uci-defaults/60_luci-unbound b/applications/luci-app-unbound/root/etc/uci-defaults/60_luci-unbound
deleted file mode 100644
index d7bfee271d..0000000000
--- a/applications/luci-app-unbound/root/etc/uci-defaults/60_luci-unbound
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/applications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp b/applications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp
index e9636f9a28..f63d648c06 100755
--- a/applications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp
+++ b/applications/luci-app-upnp/root/etc/uci-defaults/40_luci-miniupnp
@@ -7,5 +7,4 @@ uci -q batch <<-EOF >/dev/null
 	commit ucitrack
 EOF
 
-rm -f /tmp/luci-indexcache
 exit 0
diff --git a/applications/luci-app-vnstat/root/etc/uci-defaults/40_luci-vnstat b/applications/luci-app-vnstat/root/etc/uci-defaults/40_luci-vnstat
deleted file mode 100755
index d7bfee271d..0000000000
--- a/applications/luci-app-vnstat/root/etc/uci-defaults/40_luci-vnstat
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-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
index a1ecfcea24..afe3de8c60 100644
--- 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
@@ -1,3 +1,3 @@
 #!/bin/sh
-rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache;
+rm -rf /var/luci-modulecache/;
 exit 0
diff --git a/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass b/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass
deleted file mode 100644
index d7bfee271d..0000000000
--- a/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
diff --git a/applications/luci-app-watchcat/root/etc/uci-defaults/40_luci-watchcat b/applications/luci-app-watchcat/root/etc/uci-defaults/40_luci-watchcat
index 6eb87210e0..02a7f09783 100644
--- a/applications/luci-app-watchcat/root/etc/uci-defaults/40_luci-watchcat
+++ b/applications/luci-app-watchcat/root/etc/uci-defaults/40_luci-watchcat
@@ -7,5 +7,4 @@ uci -q batch <<-EOF >/dev/null
 	commit ucitrack
 EOF
 
-rm -f /tmp/luci-indexcache
 exit 0
diff --git a/luci.mk b/luci.mk
index 5333fe11a1..fc02e84f7e 100644
--- a/luci.mk
+++ b/luci.mk
@@ -229,6 +229,13 @@ define Package/$(PKG_NAME)/postinst
 	exit 0
 }
 endef
+else
+define Package/$(PKG_NAME)/postinst
+[ -n "$${IPKG_INSTROOT}" ] || {
+	rm -f /tmp/luci-indexcache
+	exit 0
+}
+endef
 endif