From 0f4519ddf254828a45e92475c5cde10ed593985b Mon Sep 17 00:00:00 2001
From: gitea-action <git@cooluc.com>
Date: Wed, 26 Feb 2025 18:30:21 +0800
Subject: [PATCH] nikki: sync upstream

last commit: https://github.com/nikkinikki-org/OpenWrt-nikki/commit/5e48c118e66101424e05f0ae598d334562adf6fb
---
 nikki/files/nikki.init | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nikki/files/nikki.init b/nikki/files/nikki.init
index 073764fc3..58b60c430 100644
--- a/nikki/files/nikki.init
+++ b/nikki/files/nikki.init
@@ -102,11 +102,10 @@ start_service() {
 		log "Mixin" "Mixin all config."
 	fi
 	if [ "$mixin_file_content" == 0 ]; then
-		ucode -S "$MIXIN_UC" | yq -M -p json -o yaml | yq -M -i ea '. as $item ireduce ({}; . * $item ) | .rules = .nikki-rules + .rules | del(.nikki-rules)' "$RUN_PROFILE_PATH" -
+		ucode -S "$MIXIN_UC" | yq -M -p json -o yaml | yq -M -i ea '... comments="" | . as $item ireduce ({}; . * $item ) | .rules = .nikki-rules + .rules | del(.nikki-rules)' "$RUN_PROFILE_PATH" -
 	elif [ "$mixin_file_content" == 1 ]; then
-		ucode -S "$MIXIN_UC" | yq -M -p json -o yaml | yq -M -i ea '. as $item ireduce ({}; . * $item ) | .rules = .nikki-rules + .rules | del(.nikki-rules)' "$RUN_PROFILE_PATH" "$MIXIN_FILE_PATH" -
+		ucode -S "$MIXIN_UC" | yq -M -p json -o yaml | yq -M -i ea '... comments="" | . as $item ireduce ({}; . * $item ) | .rules = .nikki-rules + .rules | del(.nikki-rules)' "$RUN_PROFILE_PATH" "$MIXIN_FILE_PATH" -
 	fi
-	yq -M -i '... comments=""' "$RUN_PROFILE_PATH"
 	# test profile
 	if [ "$test_profile" == 1 ]; then
 		log "Profile" "Testing..."