Merge pull request #3631 from TDT-AG/pr/20200214-luci-build

build: unify and clean up the uci-defaults scripts
2020-02-15 13:05:21 +01:00 · 2020-02-15 13:05:21 +01:00 · 07f6822b66
commit 07f6822b66
parent 34777f342f b9292a6f57
41 changed files with 9 additions and 109 deletions
--- a/applications/luci-app-adblock/root/etc/uci-defaults/40_luci-adblock
+++ b/applications/luci-app-adblock/root/etc/uci-defaults/40_luci-adblock
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- 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 +0,0 @@
-#!/bin/sh
-
-rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache;
-exit 0
-
--- 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
--- 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
--- 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-indexcache /tmp/luci-modulecache/
 /etc/init.d/uhttpd restart
 /etc/init.d/rpcd reload

--- a/applications/luci-app-banip/root/etc/uci-defaults/40_luci-banip
+++ b/applications/luci-app-banip/root/etc/uci-defaults/40_luci-banip
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- a/applications/luci-app-bcp38/root/etc/uci-defaults/60_luci-bcp38
+++ b/applications/luci-app-bcp38/root/etc/uci-defaults/60_luci-bcp38
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- a/applications/luci-app-dcwapd/root/etc/uci-defaults/60_luci-dcwapd
+++ b/applications/luci-app-dcwapd/root/etc/uci-defaults/60_luci-dcwapd
@ -1,3 +0,0 @@
-#!/bin/sh
-
-exit 0
--- 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
--- 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
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- a/applications/luci-app-dump1090/root/etc/uci-defaults/40_luci-dump1090
+++ b/applications/luci-app-dump1090/root/etc/uci-defaults/40_luci-dump1090
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- 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
-
--- 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
--- 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
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- 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 +0,0 @@
-#!/bin/sh
-rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache;
-exit 0
--- 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
--- 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
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- 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
--- a/applications/luci-app-nextdns/root/etc/uci-defaults/60_luci-nextdns
+++ b/applications/luci-app-nextdns/root/etc/uci-defaults/60_luci-nextdns
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- a/applications/luci-app-nlbwmon/root/etc/uci-defaults/40_luci-nlbwmon
+++ b/applications/luci-app-nlbwmon/root/etc/uci-defaults/40_luci-nlbwmon
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- a/applications/luci-app-noddos/root/etc/uci-defaults/40_luci-noddos
+++ b/applications/luci-app-noddos/root/etc/uci-defaults/40_luci-noddos
@ -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
--- 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
--- 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
--- 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
--- a/applications/luci-app-pagekitec/root/etc/uci-defaults/40_luci-pagekitec
+++ b/applications/luci-app-pagekitec/root/etc/uci-defaults/40_luci-pagekitec
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- 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
--- 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
--- 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
--- 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
--- a/applications/luci-app-shairplay/root/etc/uci-defaults/40_luci-shairplay
+++ b/applications/luci-app-shairplay/root/etc/uci-defaults/40_luci-shairplay
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- 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
--- 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
--- a/applications/luci-app-travelmate/root/etc/uci-defaults/40_luci-travelmate
+++ b/applications/luci-app-travelmate/root/etc/uci-defaults/40_luci-travelmate
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- a/applications/luci-app-udpxy/root/etc/uci-defaults/40_luci-udpxy
+++ b/applications/luci-app-udpxy/root/etc/uci-defaults/40_luci-udpxy
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- a/applications/luci-app-unbound/root/etc/uci-defaults/60_luci-unbound
+++ b/applications/luci-app-unbound/root/etc/uci-defaults/60_luci-unbound
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- 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
--- a/applications/luci-app-vnstat/root/etc/uci-defaults/40_luci-vnstat
+++ b/applications/luci-app-vnstat/root/etc/uci-defaults/40_luci-vnstat
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- 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 +0,0 @@
-#!/bin/sh
-rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache;
-exit 0
--- a/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass
+++ b/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass
@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f /tmp/luci-indexcache
-exit 0
--- 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
--- a/luci.mk
+++ b/luci.mk
@ -226,6 +226,15 @@ 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
+else
+define Package/$(PKG_NAME)/postinst
+[ -n "$${IPKG_INSTROOT}" ] || {
+	rm -f /tmp/luci-indexcache
+	rm -rf /tmp/luci-modulecache/
 	exit 0
 }
 endef