From 8134bfb8a4f932a07bb4b16369fa5a8d8ba2e552 Mon Sep 17 00:00:00 2001 From: Ivan Diaz Date: Tue, 23 Dec 2025 08:30:29 -0500 Subject: [PATCH] luci-app-watchcat: revert unnecessary quoting in init script The quoting added in r18 for pinghosts is not needed. Multi-host support remains fully functional, but the extra quotes caused inconsistent argument handling between /etc/init.d/watchcat and /usr/bin/watchcat.sh, especially for single-IP configurations. This revert removes the unnecessary quoting in the init script and LUCI, restoring consistent behavior while keeping multiple ping hosts supported. Fixes: #28100 (watchcat: error if only one address is specified in pinghosts) Signed-off-by: Ivan Diaz (cherry picked from commit 407617b78662f7fb0d4640ded0c2afbcc7c72e6e) --- utils/watchcat/Makefile | 2 +- utils/watchcat/files/watchcat.init | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/watchcat/Makefile b/utils/watchcat/Makefile index 7b011cf036..e93525f69e 100644 --- a/utils/watchcat/Makefile +++ b/utils/watchcat/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=watchcat PKG_VERSION:=1 -PKG_RELEASE:=19 +PKG_RELEASE:=20 PKG_MAINTAINER:=Roger D PKG_LICENSE:=GPL-2.0 diff --git a/utils/watchcat/files/watchcat.init b/utils/watchcat/files/watchcat.init index da1cd0e775..9bfc68d0e3 100644 --- a/utils/watchcat/files/watchcat.init +++ b/utils/watchcat/files/watchcat.init @@ -104,19 +104,19 @@ config_watchcat() { ;; ping_reboot) procd_open_instance "watchcat_${1}" - procd_set_param command /usr/bin/watchcat.sh "ping_reboot" "$period" "$forcedelay" \"$pinghosts\" "$pingperiod" "$pingsize" "$addressfamily" "$interface" + procd_set_param command /usr/bin/watchcat.sh "ping_reboot" "$period" "$forcedelay" "$pinghosts" "$pingperiod" "$pingsize" "$addressfamily" "$interface" procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}" procd_close_instance ;; restart_iface) procd_open_instance "watchcat_${1}" - procd_set_param command /usr/bin/watchcat.sh "restart_iface" "$period" \"$pinghosts\" "$pingperiod" "$pingsize" "$interface" "$mmifacename" "$unlockbands" "$addressfamily" + procd_set_param command /usr/bin/watchcat.sh "restart_iface" "$period" "$pinghosts" "$pingperiod" "$pingsize" "$interface" "$mmifacename" "$unlockbands" "$addressfamily" procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}" procd_close_instance ;; run_script) procd_open_instance "watchcat_${1}" - procd_set_param command /usr/bin/watchcat.sh "run_script" "$period" \"$pinghosts\" "$pingperiod" "$pingsize" "$interface" "$addressfamily" "$script" + procd_set_param command /usr/bin/watchcat.sh "run_script" "$period" "$pinghosts" "$pingperiod" "$pingsize" "$interface" "$addressfamily" "$script" procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}" procd_close_instance ;;