From 814ad96df9634f39cb793c31d55b0351f88fadff Mon Sep 17 00:00:00 2001 From: Richard Yu Date: Tue, 3 Dec 2019 23:09:34 +0800 Subject: [PATCH] treewide: remove useless ucitrack definitions Signed-off-by: Richard Yu --- .../root/etc/uci-defaults/40_luci-adblock | 7 ------- .../luci-app-aria2/root/etc/uci-defaults/40_luci-aria2 | 7 ------- .../luci-app-banip/root/etc/uci-defaults/40_luci-banip | 7 ------- .../luci-app-bcp38/root/etc/uci-defaults/60_luci-bcp38 | 7 ------- .../luci-app-dcwapd/root/etc/uci-defaults/60_luci-dcwapd | 8 -------- .../root/etc/uci-defaults/60_luci-dnscrypt-proxy | 7 ------- .../root/etc/uci-defaults/40_luci-dump1090 | 8 -------- .../root/etc/uci-defaults/40_luci-fwknopd | 5 ----- .../root/etc/uci-defaults/40_luci-hd_idle | 7 ------- .../root/etc/uci-defaults/40_luci-mjpg-streamer | 7 ------- .../root/etc/uci-defaults/60_luci-nextdns | 7 ------- .../root/etc/uci-defaults/40_luci-nlbwmon | 7 ------- .../luci-app-noddos/root/etc/uci-defaults/40_luci-noddos | 7 ------- .../root/etc/uci-defaults/40_luci-pagekitec | 7 ------- .../root/etc/uci-defaults/40_luci-shadowsocks-libev | 7 ------- .../root/etc/uci-defaults/40_luci-shairplay | 8 -------- .../root/etc/uci-defaults/40_luci-travelmate | 7 ------- .../luci-app-udpxy/root/etc/uci-defaults/40_luci-udpxy | 8 -------- .../root/etc/uci-defaults/60_luci-unbound | 8 -------- .../luci-app-vnstat/root/etc/uci-defaults/40_luci-vnstat | 7 ------- .../root/etc/uci-defaults/40_luci-vpnbypass | 7 ------- 21 files changed, 150 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 index 1f7fb1c0f..d7bfee271 100755 --- 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,11 +1,4 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@adblock[-1] - add ucitrack adblock - set ucitrack.@adblock[-1].init=adblock - 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 fc6190d5a..a6b485a5c 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 @@ -1,12 +1,5 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@aria2[-1] - add ucitrack aria2 - set ucitrack.@aria2[-1].init=aria2 - commit ucitrack -EOF - if [ ."$(uci -q get aria2.main)" != ."aria2" ]; then uci -q batch <<-EOF >/dev/null add aria2 aria2 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 index adb22da91..d7bfee271 100755 --- 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,11 +1,4 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@banip[-1] - add ucitrack banip - set ucitrack.@banip[-1].init=banip - commit ucitrack -EOF - 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 index c204236e3..d7bfee271 100755 --- 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,11 +1,4 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@bcp38[-1] - add ucitrack bcp38 - add_list ucitrack.@bcp38[0].affects=firewall - commit ucitrack -EOF - 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 index 36455f834..c52d3c26b 100644 --- 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,11 +1,3 @@ #!/bin/sh -# register commit handler -uci -q batch <<-EOF >/dev/null - delete ucitrack.@dcwapd[-1] - add ucitrack dcwapd - set ucitrack.@dcwapd[-1].init=dcwapd - commit ucitrack -EOF - exit 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 index ec4da17c9..d7bfee271 100755 --- 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,11 +1,4 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@dnscrypt-proxy[-1] - add ucitrack dnscrypt-proxy - set ucitrack.@dnscrypt-proxy[-1].init=dnscrypt-proxy - commit ucitrack -EOF - 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 index 4475d2fb9..d7bfee271 100644 --- 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,12 +1,4 @@ #!/bin/sh -# needed for "Save and Apply" to restart dump1090 -uci -q batch <<-EOF >/dev/null - delete ucitrack.@dump1090[-1] - add ucitrack dump1090 - set ucitrack.@dump1090[-1].init="dump1090" - commit ucitrack -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 87d79e58b..f81c941e8 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 @@ -4,11 +4,6 @@ . /lib/functions/network.sh [ "$(uci -q get fwknopd.@access[0].KEY)" != "CHANGEME" ] && exit 0 -uci batch </dev/null - delete ucitrack.@hd-idle[-1] - add ucitrack hd-idle - set ucitrack.@hd-idle[-1].init=hd-idle - 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 index 6a380cfe5..d7bfee271 100755 --- 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,11 +1,4 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@mjpg-streamer[-1] - add ucitrack mjpg-streamer - set ucitrack.@mjpg-streamer[-1].init=mjpg-streamer - commit ucitrack -EOF - rm -f /tmp/luci-indexcache 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 index 95fc92280..d7bfee271 100755 --- 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,11 +1,4 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@nextdns[-1] - add ucitrack nextdns - set ucitrack.@nextdns[-1].init=nextdns - commit ucitrack -EOF - 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 index c9771779e..d7bfee271 100644 --- 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,11 +1,4 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@nlbwmon[-1] - add ucitrack nlbwmon - set ucitrack.@nlbwmon[-1].init=nlbwmon - commit ucitrack -EOF - 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 index 17abbc41c..5225b63a8 100644 --- a/applications/luci-app-noddos/root/etc/uci-defaults/40_luci-noddos +++ b/applications/luci-app-noddos/root/etc/uci-defaults/40_luci-noddos @@ -3,12 +3,5 @@ # Copyright (C) 2017 Steven Hessing (steven.hessing@live.com) # This is free software, licensed under the GNU General Public License v3 -uci -q batch <<-EOF >/dev/null - delete ucitrack.@noddos[-1] - add ucitrack noddos - set ucitrack.@noddos[-1].init=noddos - 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 index 95d7e9ec8..d7bfee271 100755 --- 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,11 +1,4 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@pagekitec[-1] - add ucitrack pagekitec - set ucitrack.@pagekitec[-1].init=pagekitec - 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 4cc9abcee..10e1c702f 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,12 +1,5 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@shadowsocks-libev[-1] - add ucitrack shadowsocks-libev - set ucitrack.@shadowsocks-libev[-1].init=shadowsocks-libev - commit ucitrack -EOF - rm -f /tmp/luci-indexcache mkdir -p /etc/shadowsocks-libev /etc/init.d/rpcd reload 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 index efc8a89bb..d7bfee271 100644 --- 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,12 +1,4 @@ #!/bin/sh -# needed for "Save and Apply" to restart shairplay -uci -q batch <<-EOF >/dev/null - delete ucitrack.@shairplay[-1] - add ucitrack shairplay - set ucitrack.@shairplay[-1].init="shairplay" - commit ucitrack -EOF - 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 index f7676774a..d7bfee271 100755 --- 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,11 +1,4 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@travelmate[-1] - add ucitrack travelmate - set ucitrack.@travelmate[-1].init=travelmate - commit ucitrack -EOF - 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 index e93c07880..d7bfee271 100644 --- 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,12 +1,4 @@ #!/bin/sh -# needed for "Save and Apply" to restart udpxy -uci -q batch <<-EOF >/dev/null - delete ucitrack.@udpxy[-1] - add ucitrack udpxy - set ucitrack.@udpxy[-1].init="udpxy" - commit ucitrack -EOF - 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 index c2ac8c93b..d7bfee271 100644 --- 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,12 +1,4 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@unbound[-1] - add ucitrack unbound - set ucitrack.@unbound[-1].init=unbound - 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 index fa204b3b4..d7bfee271 100755 --- 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,11 +1,4 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@vnstat[-1] - add ucitrack vnstat - set ucitrack.@vnstat[-1].init=vnstat - commit ucitrack -EOF - rm -f /tmp/luci-indexcache 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 index 9455701a0..d7bfee271 100644 --- 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,11 +1,4 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@vpnbypass[-1] - add ucitrack vpnbypass - set ucitrack.@vpnbypass[-1].init=vpnbypass - commit ucitrack -EOF rm -f /tmp/luci-indexcache exit 0 - -- 2.25.1