💐 Sync 2026-07-18 20:20:11

luci-app-daede/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-daede
 PKG_VERSION:=1.14.7
-PKG_RELEASE:=32
+PKG_RELEASE:=33
 PKG_MAINTAINER:=kenzok8
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 

luci-app-daede/htdocs/luci-static/resources/view/daede/daed.js

@@ -99,7 +99,7 @@ function renderDaedSettings() {
 					const err = (res.stderr || res.stdout || ('exit ' + res.code)).trim().split('\n')[0];
 					flash(_('Subscription update failed: %s').format(err), 'err', 9000);
 				} else {
-					flash(_('Subscriptions updated'), 'ok');
+					flash(_('Subscriptions updated (daed restarted)'), 'ok');
 				}
 			}).catch(function(e) {
 				flash(_('Subscription update failed: %s').format(e.message || e), 'err', 9000);

luci-app-daede/po/zh-cn/daede.po

@@ -628,6 +628,9 @@ msgstr "更新失败：%s"
 msgid "Subscriptions updated (dae reloaded)"
 msgstr "订阅已更新（dae 已重载）"
 
+msgid "Subscriptions updated (daed restarted)"
+msgstr "订阅已更新，daed 已重启"
+
 msgid "Section"
 msgstr "区块"
 

luci-app-daede/po/zh_Hans/daede.po

@@ -628,6 +628,9 @@ msgstr "更新失败：%s"
 msgid "Subscriptions updated (dae reloaded)"
 msgstr "订阅已更新（dae 已重载）"
 
+msgid "Subscriptions updated (daed restarted)"
+msgstr "订阅已更新，daed 已重启"
+
 msgid "Section"
 msgstr "区块"
 

luci-app-daede/root/usr/share/luci-app-daede/daed-sub-update.sh

@@ -115,4 +115,16 @@ while IFS= read -r id || [ -n "$id" ]; do
 done < "$TMPDIR/ids"
 
 log "finished daed subscription update: ok=$ok fail=$fail total=$count"
-[ "$fail" -eq 0 ]
+
+if [ "$fail" -ne 0 ]; then
+	exit 1
+fi
+
+if [ "$count" -gt 0 ] && [ "$ok" -gt 0 ] && /bin/pidof daed >/dev/null 2>&1; then
+	log "restarting daed to apply updated subscriptions"
+	if ! /etc/init.d/daed restart >>"$LOG" 2>&1; then
+		fail 8 "daed restart failed after subscription update"
+	fi
+fi
+
+exit 0