diff --git a/bin/ShellCrash.tar.gz b/bin/ShellCrash.tar.gz index b2bcdec..230e2ad 100644 Binary files a/bin/ShellCrash.tar.gz and b/bin/ShellCrash.tar.gz differ diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 15c6bc7..77a9a46 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/version b/bin/version index 4c31c15..ae7353b 100644 --- a/bin/version +++ b/bin/version @@ -1,4 +1,4 @@ meta_v=v1.19.11 singboxr_v=1.13.0-alpha.27 -versionsh=1.9.3beta1 +versionsh=1.9.3beta1fix GeoIP_v=20251205 diff --git a/scripts/init.sh b/scripts/init.sh index 9171562..eca1247 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy -version=1.9.3beta1 +version=1.9.3beta1fix setdir() { dir_avail() { diff --git a/scripts/start.sh b/scripts/start.sh index 0f62a90..3f3843e 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -513,9 +513,9 @@ EOF proxy_groups=$(echo $line | grep -Eo '#.*' | sed "s/#//") IFS="#" for name in $proxy_groups; do - line_a=$(grep -n "\- name: $name" "$TMPDIR"/proxy-groups.yaml | awk -F: '{print $1}') #获取group行号 + line_a=$(grep -n "\- name: $name" "$TMPDIR"/proxy-groups.yaml | head -n 1 | awk -F: '{print $1}') #获取group行号 [ -n "$line_a" ] && { - line_b=$(grep -A 8 "\- name: $name" "$TMPDIR"/proxy-groups.yaml | grep -n "proxies:$" | awk -F: '{print $1}') #获取proxies行号 + line_b=$(grep -A 8 "\- name: $name" "$TMPDIR"/proxy-groups.yaml | grep -n "proxies:$" | head -n 1 | awk -F: '{print $1}') #获取proxies行号 line_c=$((line_a + line_b - 1)) #计算需要插入的行号 space=$(sed -n "$((line_c + 1))p" "$TMPDIR"/proxy-groups.yaml | grep -oE '^ *') #获取空格数 [ "$line_c" -gt 2 ] && sed -i "${line_c}a\\${space}- ${new_group} #自定义策略组" "$TMPDIR"/proxy-groups.yaml @@ -536,7 +536,7 @@ EOF proxy_groups=$(echo $line | grep -Eo '#.*' | sed "s/#//") IFS="#" for name in $proxy_groups; do - line_a=$(grep -n "\- name: $name" "$TMPDIR"/proxy-groups.yaml | awk -F: '{print $1}') #获取group行号 + line_a=$(grep -n "\- name: $name" "$TMPDIR"/proxy-groups.yaml | head -n 1 | awk -F: '{print $1}') #获取group行号 [ -n "$line_a" ] && { line_b=$(grep -A 8 "\- name: $name" "$TMPDIR"/proxy-groups.yaml | grep -n "proxies:$" | head -n 1 | awk -F: '{print $1}') #获取proxies行号 line_c=$((line_a + line_b - 1)) #计算需要插入的行号 @@ -575,7 +575,7 @@ EOF yaml_user="$CRASHDIR"/yamls/user.yaml #set和user去重,且优先使用user.yaml cp -f "$TMPDIR"/set.yaml "$TMPDIR"/set_bak.yaml - for char in mode allow-lan log-level tun experimental interface-name dns store-selected; do + for char in mode allow-lan log-level tun experimental external-ui-url interface-name dns store-selected; do [ -n "$(grep -E "^$char" $yaml_user)" ] && sed -i "/^$char/d" "$TMPDIR"/set.yaml done }