diff --git a/scripts/libs/get_config.sh b/scripts/libs/get_config.sh index 333c85ac..d882287d 100644 --- a/scripts/libs/get_config.sh +++ b/scripts/libs/get_config.sh @@ -13,10 +13,7 @@ routing_mark=$((fwmark + 2)) [ -z "$dns_nameserver" ] && { dns_nameserver='223.5.5.5, 1.2.4.8' - cat /proc/net/udp | grep -q '0035' && dns_nameserver='localhost' + cat /proc/net/udp | grep -q '0035' && dns_nameserver='127.0.0.1' } [ -z "$dns_fallback" ] && dns_fallback="1.1.1.1, 8.8.8.8" -[ -z "$dns_resolver" ] && { - dns_resolver="223.5.5.5, 2400:3200::1" - cat /proc/net/udp | grep -q '0035' && dns_resolver='127.0.0.1' -} \ No newline at end of file +[ -z "$dns_resolver" ] && dns_resolver="223.5.5.5, 2400:3200::1" diff --git a/scripts/libs/web_get.sh b/scripts/libs/web_get.sh index 261a91ee..51ccb5df 100644 --- a/scripts/libs/web_get.sh +++ b/scripts/libs/web_get.sh @@ -43,7 +43,7 @@ webget(){ wget -Y off $progress -O "$1" "$2" return $? else - echo "找不到可用下载工具!!!请安装Curl或Wget!!!" + echo "No Curl or Wget!!!" return 1 fi } \ No newline at end of file diff --git a/scripts/menus/6_core_config.sh b/scripts/menus/6_core_config.sh index 39a3dc73..35601c41 100644 --- a/scripts/menus/6_core_config.sh +++ b/scripts/menus/6_core_config.sh @@ -448,7 +448,7 @@ EOF done < "$CRASHDIR"/configs/providers.cfg fi #修饰模版文件并合并 - sed -i "s/{providers_tags}/$providers_tags/g" "$TMPDIR"/providers/proxy-groups.yaml + sed -i "s/\{providers_tags\}\|providers_tags/$providers_tags/g" "$TMPDIR"/providers/proxy-groups.yaml cut -c 1- "$TMPDIR"/providers/providers.yaml "$TMPDIR"/providers/proxy-groups.yaml "$TMPDIR"/providers/rules.yaml > "$TMPDIR"/config.yaml rm -rf "$TMPDIR"/providers #调用内核测试 @@ -551,7 +551,7 @@ EOF sed -i '$s/},/}]}/' "$TMPDIR"/providers/outbounds_add.json sed -i '$s/},/}]}/' "$TMPDIR"/providers/providers.json #使用模版生成outbounds和rules模块 - cat "$TMPDIR"/provider_temp_file | sed "s/{providers_tags}/$providers_tags/g" > "$TMPDIR"/providers/outbounds.json + cat "$TMPDIR"/provider_temp_file | sed "s/\{providers_tags\}\|\"providers_tags\"/$providers_tags/g" > "$TMPDIR"/providers/outbounds.json rm -rf "$TMPDIR"/provider_temp_file #调用内核测试 . "$CRASHDIR"/starts/check_core.sh && check_core && "$TMPDIR"/CrashCore merge "$TMPDIR"/config.json -C "$TMPDIR"/providers