Backups/clash-for-linux
1
0
Fork 0
mirror of https://github.com/wnlen/clash-for-linux.git synced 2026-10-10 04:03:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: apply mixin prepend and append arrays to runtime config

Browse Source
This commit is contained in:
Arvin
2026-04-14 21:23:28 +08:00
parent fc2fc000b8
commit c752f71b5a
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/core/config.sh
+12 -12
View File
@@ -1940,12 +1940,12 @@ apply_mixin_prepend_arrays() {
[ -s "$runtime_file" ] || die "运行配置不存在：$runtime_file"
[ -f "$mixin_file_path" ] || return 0
RUNTIME_FILE="$runtime_file" MIXIN_FILE="$mixin_file_path" "$(yq_bin)" eval-all -i '
select(fileIndex == 0)
| .proxies = (((select(fileIndex == 1).prepend.proxies // []) + (.proxies // [])) | unique_by(.name))
| .["proxy-groups"] = (((select(fileIndex == 1).prepend["proxy-groups"] // []) + (.["proxy-groups"] // [])) | unique_by(.name))
| .rules = (((select(fileIndex == 1).prepend.rules // []) + (.rules // [])) | unique)
' "$runtime_file" "$mixin_file_path"
RUNTIME_FILE="$runtime_file" MIXIN_FILE="$mixin_file_path" "$(yq_bin)" eval -i '
(load(strenv(MIXIN_FILE)) // {}) as $mixin
| .proxies = ((($mixin.prepend.proxies // []) + (.proxies // [])) | unique_by(.name))
| .["proxy-groups"] = ((($mixin.prepend["proxy-groups"] // []) + (.["proxy-groups"] // [])) | unique_by(.name))
| .rules = ((($mixin.prepend.rules // []) + (.rules // [])) | unique)
' "$runtime_file"
}
apply_mixin_append_arrays() {
@@ -1956,12 +1956,12 @@ apply_mixin_append_arrays() {
[ -s "$runtime_file" ] || die "运行配置不存在：$runtime_file"
[ -f "$mixin_file_path" ] || return 0
RUNTIME_FILE="$runtime_file" MIXIN_FILE="$mixin_file_path" "$(yq_bin)" eval-all -i '
select(fileIndex == 0)
| .proxies = (((.proxies // []) + (select(fileIndex == 1).append.proxies // [])) | unique_by(.name))
| .["proxy-groups"] = (((.["proxy-groups"] // []) + (select(fileIndex == 1).append["proxy-groups"] // [])) | unique_by(.name))
| .rules = (((.rules // []) + (select(fileIndex == 1).append.rules // [])) | unique)
' "$runtime_file" "$mixin_file_path"
RUNTIME_FILE="$runtime_file" MIXIN_FILE="$mixin_file_path" "$(yq_bin)" eval -i '
(load(strenv(MIXIN_FILE)) // {}) as $mixin
| .proxies = (((.proxies // []) + ($mixin.append.proxies // [])) | unique_by(.name))
| .["proxy-groups"] = (((.["proxy-groups"] // []) + ($mixin.append["proxy-groups"] // [])) | unique_by(.name))
| .rules = (((.rules // []) + ($mixin.append.rules // [])) | unique)
' "$runtime_file"
}
apply_runtime_mixin() {