Browse Source

Merge pull request #1949 from dibdot/master

adblock: busybox "tr" does not support character classes by default
Steven Barth 9 years ago
parent
commit
1553468e04
2 changed files with 3 additions and 3 deletions
  1. 1
    1
      net/adblock/Makefile
  2. 2
    2
      net/adblock/files/adblock-update.sh

+ 1
- 1
net/adblock/Makefile View File

7
 include $(TOPDIR)/rules.mk
7
 include $(TOPDIR)/rules.mk
8
 
8
 
9
 PKG_NAME:=adblock
9
 PKG_NAME:=adblock
10
-PKG_VERSION:=0.20.0
10
+PKG_VERSION:=0.20.1
11
 PKG_RELEASE:=1
11
 PKG_RELEASE:=1
12
 PKG_LICENSE:=GPL-3.0+
12
 PKG_LICENSE:=GPL-3.0+
13
 PKG_MAINTAINER:=Dirk Brenken <dirk@brenken.org>
13
 PKG_MAINTAINER:=Dirk Brenken <dirk@brenken.org>

+ 2
- 2
net/adblock/files/adblock-update.sh View File

25
 
25
 
26
 # set script version
26
 # set script version
27
 #
27
 #
28
-adb_version="0.20.0"
28
+adb_version="0.20.1"
29
 
29
 
30
 # get current pid and script directory
30
 # get current pid and script directory
31
 #
31
 #
164
     if [ $((rc)) -eq 0 ] && [ -n "${tmp_var}" ]
164
     if [ $((rc)) -eq 0 ] && [ -n "${tmp_var}" ]
165
     then
165
     then
166
         eval "$(printf "${src}" | sed 's/\(.*\&ruleset=\)/ruleset=\$/g')"
166
         eval "$(printf "${src}" | sed 's/\(.*\&ruleset=\)/ruleset=\$/g')"
167
-        tmp_var="$(printf "%s\n" "${tmp_var}" |  tr '[[:upper:]]' '[[:lower:]]')"
167
+        tmp_var="$(printf "%s\n" "${tmp_var}" | tr '[A-Z]' '[a-z]')"
168
         adb_count="$(printf "%s\n" "${tmp_var}" | eval "${ruleset}" | tee -a "${adb_tmpfile}" | wc -l)"
168
         adb_count="$(printf "%s\n" "${tmp_var}" | eval "${ruleset}" | tee -a "${adb_tmpfile}" | wc -l)"
169
         /usr/bin/logger -t "adblock[${pid}]" "info: source download finished (${url}, ${adb_count} entries)"
169
         /usr/bin/logger -t "adblock[${pid}]" "info: source download finished (${url}, ${adb_count} entries)"
170
     elif [ $((rc)) -eq 0 ] && [ -z "${tmp_var}" ]
170
     elif [ $((rc)) -eq 0 ] && [ -z "${tmp_var}" ]