From 98219d688a02b58d6486fb7a0c760126110e1d72 Mon Sep 17 00:00:00 2001 From: libm Date: Sun, 8 Jun 2025 13:06:47 +0800 Subject: [PATCH] fix: optimize merge config to fix #159 --- script/clashctl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/clashctl.sh b/script/clashctl.sh index 079b88c..2f140c0 100644 --- a/script/clashctl.sh +++ b/script/clashctl.sh @@ -84,7 +84,7 @@ function clashui() { _merge_config_restart() { local backup="/tmp/rt.backup" sudo cat "$CLASH_CONFIG_RUNTIME" 2>/dev/null | sudo tee $backup >&/dev/null - sudo "$BIN_YQ" eval-all '. as $item ireduce ({}; . *+ $item)' "$CLASH_CONFIG_RAW" "$CLASH_CONFIG_MIXIN" | sudo tee "$CLASH_CONFIG_RUNTIME" >&/dev/null + sudo "$BIN_YQ" eval-all '. as $item ireduce ({}; . *+ $item)' "$CLASH_CONFIG_MIXIN" "$CLASH_CONFIG_RAW" | sudo tee "$CLASH_CONFIG_RUNTIME" >&/dev/null _valid_config "$CLASH_CONFIG_RUNTIME" || { sudo cat $backup | sudo tee "$CLASH_CONFIG_RUNTIME" >&/dev/null _error_quit "验证失败:请检查 Mixin 配置"