diff options
| author | Stan Grishin <stangri@melmac.ca> | 2023-10-05 14:55:29 +0000 |
|---|---|---|
| committer | Stan Grishin <stangri@melmac.ca> | 2023-10-05 14:55:48 +0000 |
| commit | d15a1fb6939684583b327f7388a1473c7d49841d (patch) | |
| tree | 660e308295f7ade4f4102bfbe848ade07a8e0a74 | |
| parent | 127ca64a672ba4b748ea230cce79b0c4cc1c8207 (diff) | |
luci-app-adblock-fast: bugfix: working re-download
* bugfix: add missing dl command to RPCD script
* improve output of error messages/link to README
Signed-off-by: Stan Grishin <stangri@melmac.ca>
4 files changed, 7 insertions, 6 deletions
diff --git a/applications/luci-app-adblock-fast/Makefile b/applications/luci-app-adblock-fast/Makefile index b9aa17849b..a1666f199e 100644 --- a/applications/luci-app-adblock-fast/Makefile +++ b/applications/luci-app-adblock-fast/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> -PKG_VERSION:=1.0.0-4 +PKG_VERSION:=1.0.0-6 LUCI_TITLE:=AdBlock-Fast Web UI LUCI_DESCRIPTION:=Provides Web UI for adblock-fast service. diff --git a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js b/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js index ae41968944..89dcb8846e 100644 --- a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js +++ b/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js @@ -288,11 +288,11 @@ var status = baseclass.extend({ var text = ""; reply.status.errors.forEach((element) => { text += - errorTable[element.id].format(element.extra || " ") + "<br />"; + errorTable[element.id].format(element.extra || " ") + "!<br />"; }); - text += _("Errors encountered, please check the %sREADME%s!").format( + text += _("Errors encountered, please check the %sREADME%s").format( '<a href="' + pkg.URL + '" target="_blank">', - "</a><br />" + "</a>!<br />" ); var errorsText = E("div", {}, text); var errorsField = E("div", { class: "cbi-value-field" }, errorsText); diff --git a/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot b/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot index 630353a0be..58d4800b17 100644 --- a/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot +++ b/applications/luci-app-adblock-fast/po/templates/adblock-fast.pot @@ -200,7 +200,7 @@ msgid "Error" msgstr "" #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:293 -msgid "Errors encountered, please check the %sREADME%s!" +msgid "Errors encountered, please check the %sREADME%s" msgstr "" #: applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js:117 diff --git a/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast b/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast index b85a93f2e6..be4d0a320b 100755 --- a/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast +++ b/applications/luci-app-adblock-fast/root/usr/libexec/rpcd/luci.adblock-fast @@ -10,6 +10,7 @@ # ubus -S call luci.adblock-fast getInitStatus '{"name": "adblock-fast" }' # ubus -S call luci.adblock-fast getPlatformSupport '{"name": "adblock-fast" }' # ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "start" }' +# ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "dl" }' # ubus -S call luci.adblock-fast setInitAction '{"name": "adblock-fast", "action": "stop" }' . /lib/functions.sh @@ -134,7 +135,7 @@ set_init_action() { cmd="uci -q set ${name}.config.enabled=1 && uci commit $name";; disable) cmd="uci -q set ${name}.config.enabled=0 && uci commit $name";; - start|stop|reload|restart) + start|stop|reload|restart|dl) cmd="/etc/init.d/${name} ${action}";; esac if [ -n "$cmd" ] && eval "${cmd}" 1>/dev/null 2>&1; then |