diff --git a/autoinstall/autoinstall.sh b/autoinstall/autoinstall.sh index 525fd03..61c8e53 100755 --- a/autoinstall/autoinstall.sh +++ b/autoinstall/autoinstall.sh @@ -105,7 +105,7 @@ InstallPackages() { for _pkg in $@ do if [ -z "`$OPKG_CMD list-installed $_pkg`" ]; then - $OPKG_CMD install $_pkg + $OPKG_CMD --force-overwrite install $_pkg if [ $? -ne 0 ]; then echo "Error during installation of the package (${_pkg})" >&2 exit 1 diff --git a/luci-app-ruantiblock/po/ru/ruantiblock.po b/luci-app-ruantiblock/po/ru/ruantiblock.po index 17a9491..201dfc9 100644 --- a/luci-app-ruantiblock/po/ru/ruantiblock.po +++ b/luci-app-ruantiblock/po/ru/ruantiblock.po @@ -13,12 +13,6 @@ msgstr "" "Language: ru\n" "X-Generator: Poedit 2.0.6\n" -msgid "valid IP address" -msgstr "верный IP-адрес" - -msgid "valid address#port" -msgstr "верный IP-адрес#порт" - msgid "2nd level domains that are excluded from optimization" msgstr "Домены 2-го уровня не подлежащие оптимизации" @@ -371,3 +365,9 @@ msgstr "прим:" msgid "user entries only" msgstr "только записи пользователя" + +msgid "valid IP address" +msgstr "верный IP-адрес" + +msgid "valid address#port" +msgstr "верный IP-адрес#порт" diff --git a/luci-app-ruantiblock/po/templates/ruantiblock.pot b/luci-app-ruantiblock/po/templates/ruantiblock.pot index 510dc9b..f177db2 100644 --- a/luci-app-ruantiblock/po/templates/ruantiblock.pot +++ b/luci-app-ruantiblock/po/templates/ruantiblock.pot @@ -1,12 +1,6 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" -msgid "valid IP address" -msgstr "" - -msgid "valid address#port" -msgstr "" - msgid "2nd level domains that are excluded from optimization" msgstr "" @@ -341,3 +335,9 @@ msgstr "" msgid "user entries only" msgstr "" + +msgid "valid IP address" +msgstr "" + +msgid "valid address#port" +msgstr "" diff --git a/ruantiblock-mod-lua/files/usr/bin/ruab_parser.lua b/ruantiblock-mod-lua/files/usr/bin/ruab_parser.lua index 0022efd..3fb1895 100755 --- a/ruantiblock-mod-lua/files/usr/bin/ruab_parser.lua +++ b/ruantiblock-mod-lua/files/usr/bin/ruab_parser.lua @@ -512,7 +512,7 @@ local Rbl = Class(BlackListParser, { function Rbl:sink() return function(chunk) if chunk and chunk ~= "" then - for ip_str, fqdn_str in chunk:gmatch("%[([a-f0-9/.:', ]+)%],([^,]-),.-" .. self.records_separator) do + for ip_str, fqdn_str in chunk:gmatch("%[([a-f0-9/.:', ]+)%],([^,]-),.-" .. self.records_separator .. "?") do fqdn_sink_func(self, ip_str, fqdn_str) end end