fix: optimize merge config to fix #159
This commit is contained in:
1 parent
63272eae83
commit
98219d688a
1 file changed
+1
-1
+1
-1
@@ -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 配置"
|
||||
|
||||
Reference in new issue
Block a user