lede-packages-rs

git clone git://archive.git.mtrnord.blog/MTRNord/lede-packages-rs.git
Log | Files | Refs | README | LICENSE

commit 001646e3fe789b6dc0166d4a1aaaee7625e665a4
parent dc37ea1ba71455aca7ee7d6a960473f8f892731b
Author: Dirk Brenken <dev@brenken.org>
Date:   Tue, 21 Jun 2016 05:10:47 +0200

adbock: update 1.2.6

* small addition in case of a failed list download

Signed-off-by: Dirk Brenken <dev@brenken.org>

Diffstat:
Mnet/adblock/Makefile | 2+-
Mnet/adblock/files/adblock-update.sh | 7++++++-
2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/net/adblock/Makefile b/net/adblock/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock -PKG_VERSION:=1.2.5 +PKG_VERSION:=1.2.6 PKG_RELEASE:=1 PKG_LICENSE:=GPL-3.0+ PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> diff --git 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.5" +adb_scriptver="1.2.6" adb_mincfgver="2.2" adb_scriptdir="${0%/*}" if [ -r "${adb_pidfile}" ] @@ -161,6 +161,11 @@ do "${adb_uci}" -q set "adblock.${src_name}.adb_src_timestamp=list restored" f_log " source download failed, restored (${count} entries)" else + if [ -r "${adb_dnsdir}/${adb_dnsprefix}.${src_name}" ] + then + rm -f "${adb_dnsdir}/${adb_dnsprefix}.${src_name}" + rm_done="true" + fi "${adb_uci}" -q delete "adblock.${src_name}.adb_src_count" "${adb_uci}" -q set "adblock.${src_name}.adb_src_timestamp=download failed" f_log " source download failed, skipped"