fix: optimize yq command for fix #114
This commit is contained in:
1 parent
d5faea1f5d
commit
6fd9a71d35
1 file changed
+1
-1
+1
-1
@@ -81,7 +81,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" -n "load(\"$CLASH_CONFIG_RAW\") * load(\"$CLASH_CONFIG_MIXIN\")" | sudo tee "$CLASH_CONFIG_RUNTIME" >&/dev/null
|
||||
sudo "$BIN_YQ" eval-all '. as $item ireduce ({}; . *+ $item)' "$CLASH_CONFIG_RAW" "$CLASH_CONFIG_MIXIN" | 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