diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 12c4a929..0ff33638 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=26.4.6 -PKG_RELEASE:=1 +PKG_RELEASE:=63 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/root/usr/share/passwall/monitor.sh b/luci-app-passwall/root/usr/share/passwall/monitor.sh index 1a3a9d0c..839b5aa9 100755 --- a/luci-app-passwall/root/usr/share/passwall/monitor.sh +++ b/luci-app-passwall/root/usr/share/passwall/monitor.sh @@ -42,7 +42,7 @@ while [ 1 -eq 1 ]; do restart_count=$((restart_count + 1)) echo "$restart_count" > "$stats_file" #echo "${cmd} 进程挂掉,重启" >> /tmp/log/passwall.log - eval "$cmd 2>&1 &" + sh -c "nohup $cmd 2>&1 &" sleep 1 fi done diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index 2ef979d1..78cf8325 100644 --- a/luci-app-passwall2/Makefile +++ b/luci-app-passwall2/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall2 PKG_VERSION:=26.4.10 -PKG_RELEASE:=1 +PKG_RELEASE:=19 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/momo/Makefile b/momo/Makefile index 54b2677a..c6609c69 100644 --- a/momo/Makefile +++ b/momo/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=momo PKG_VERSION:=2026.04.09 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_LICENSE:=GPL-3.0+ PKG_MAINTAINER:=Joseph Mory diff --git a/momo/files/momo.init b/momo/files/momo.init index a8457311..a8ea4de7 100644 --- a/momo/files/momo.init +++ b/momo/files/momo.init @@ -56,10 +56,9 @@ start_service() { fi # get config ## app config - local scheduled_restart cron_expression profile test_profile core_only - local log_cleanup_enabled log_cleanup_cron_expression log_cleanup_size_enabled log_cleanup_size_check_cron_expression log_cleanup_size_mb + local scheduled_restart scheduled_restart_cron profile test_profile core_only config_get_bool scheduled_restart "config" "scheduled_restart" 0 - config_get cron_expression "config" "cron_expression" + config_get scheduled_restart_cron "config" "scheduled_restart_cron" config_get profile "config" "profile" config_get_bool test_profile "config" "test_profile" 0 config_get_bool core_only "config" "core_only" 0