procd: fix invalid JSON filter expression in procd_running()

Since service and instance names may contain characters which are not allowed
in JSON path labels, such as dashes or spaces, change the filter expression
to array square bracket notation to properly match these cases as well.

Fixes: 2c3dd70741 ("procd: add procd_running() helper for checking running state")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c933b6d22478c1113629ef549beea6337f978d62)

diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index 22f02fb7531a4ecc2b3639eb26662c2f83e8dced..de593075e4ba4e8f3cfda2f54a0e6289768a57b7 100644 (file)
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=procd
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/procd.git

diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index 8d6d4060125f7dc8c07f967ac323793fb7b32d3e..529ded1795d285de394e7e33d1fffa2ebfeb9f5e 100644 (file)
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -412,7 +412,7 @@ procd_running() {
 
        json_init
        json_add_string name "$service"
-       running=$(_procd_ubus_call list | jsonfilter -e "@.$service.instances.${instance}.running")
+       running=$(_procd_ubus_call list | jsonfilter -e "@['$service'].instances['$instance'].running")
 
        [ "$running" = "true" ]
 }