luci-app-adblock-fast: prepare migration to APK

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit b6c9d5f9744e8e84829115692e7f02c165cc2a34)

diff --git a/applications/luci-app-adblock-fast/Makefile b/applications/luci-app-adblock-fast/Makefile
index 47cdeb1f887fb5521f96a57a0c2a97dd8a0792c0..cc7948130d9be5f2a7619533a4e3c2db3ed03fa2 100644 (file)
--- 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.1.1-5
+PKG_VERSION:=1.1.1-r7
 
 LUCI_TITLE:=AdBlock-Fast Web UI
 LUCI_DESCRIPTION:=Provides Web UI for adblock-fast service.

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 63c50c403d261a8c079d992a920f8a461e33270c..8859c11d71d63488019bef992e09d6db6882ca26 100755 (executable)
--- 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
@@ -120,7 +120,7 @@ get_init_status() {
        else
                json_add_boolean 'running' '0'
        fi
-       json_add_string 'version' "$(get_version "$name")"
+       json_add_string 'version' "$PKG_VERSION"
        errors="$(ubus_get_data errors)"
        json_add_array 'errors'
        if [ -n "$errors" ]; then