mirror of
https://github.com/openwrt/packages.git
synced 2026-04-15 10:51:55 +00:00
adblock: update 4.5.4-3
* fixed a problem/regression with the display of results in f_search and f_report Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
|
|||||||
|
|
||||||
PKG_NAME:=adblock
|
PKG_NAME:=adblock
|
||||||
PKG_VERSION:=4.5.4
|
PKG_VERSION:=4.5.4
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=3
|
||||||
PKG_LICENSE:=GPL-3.0-or-later
|
PKG_LICENSE:=GPL-3.0-or-later
|
||||||
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
|
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
|
||||||
|
|
||||||
|
|||||||
@@ -1468,7 +1468,7 @@ f_search() {
|
|||||||
[ "${res}" != "true" ] && printf '%s\n\n' " - no match" >>"${tmp_result}"
|
[ "${res}" != "true" ] && printf '%s\n\n' " - no match" >>"${tmp_result}"
|
||||||
fi
|
fi
|
||||||
"${adb_mvcmd}" -f "${tmp_result}" "${result}"
|
"${adb_mvcmd}" -f "${tmp_result}" "${result}"
|
||||||
printf '%s\n' "$(< "${result}")"
|
"${adb_catcmd}" "${result}" 2>>"${adb_errorlog}"
|
||||||
}
|
}
|
||||||
|
|
||||||
# update runtime information
|
# update runtime information
|
||||||
@@ -2213,7 +2213,7 @@ f_report() {
|
|||||||
jsn="$("${adb_catcmd}" ${report_jsn} ${map_jsn} 2>>"${adb_errorlog}")"
|
jsn="$("${adb_catcmd}" ${report_jsn} ${map_jsn} 2>>"${adb_errorlog}")"
|
||||||
[ -n "${jsn}" ] && printf '[%s]]\n' "${jsn}"
|
[ -n "${jsn}" ] && printf '[%s]]\n' "${jsn}"
|
||||||
else
|
else
|
||||||
jsn="$(< "${report_jsn}")" 2>>"${adb_errorlog}"
|
jsn="$("${adb_catcmd}" "${report_jsn}" 2>>"${adb_errorlog}")"
|
||||||
[ -n "${jsn}" ] && printf '[%s]\n' "${jsn}"
|
[ -n "${jsn}" ] && printf '[%s]\n' "${jsn}"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|||||||
Reference in New Issue
Block a user