X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fadblock%2Ffiles%2Fadblock-update.sh;h=f14d750b835547c2dca85a85415f8b8b78be3519;hb=ba13e81d21b4df209a2c8a69a0e64f3fa9f708e0;hp=7c0f574ee9bbe0dd49391edd592efa7acfaf620a;hpb=001646e3fe789b6dc0166d4a1aaaee7625e665a4;p=feed%2Fpackages.git diff --git a/net/adblock/files/adblock-update.sh b/net/adblock/files/adblock-update.sh index 7c0f574ee9..f14d750b83 100755 --- a/net/adblock/files/adblock-update.sh +++ b/net/adblock/files/adblock-update.sh @@ -10,7 +10,7 @@ # adb_pid="${$}" adb_pidfile="/var/run/adblock.pid" -adb_scriptver="1.2.6" +adb_scriptver="1.2.7" adb_mincfgver="2.2" adb_scriptdir="${0%/*}" if [ -r "${adb_pidfile}" ] @@ -22,11 +22,8 @@ else printf "${adb_pid}" > "${adb_pidfile}" if [ -r "${adb_scriptdir}/adblock-helper.sh" ] then - if [ -z "$(type -f f_envload)" ] - then - . "${adb_scriptdir}/adblock-helper.sh" - f_envload - fi + . "${adb_scriptdir}/adblock-helper.sh" + f_envload else rc=254 logger -s -t "adblock[${adb_pid}] error" "adblock function library not found"