diff --git a/scripts/clash.sh b/scripts/clash.sh index d9de37d..3723317 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -244,14 +244,14 @@ setdns(){ clashadv elif [ "$num" = 1 ]; then read -p "请输入新的DNS > " dns_nameserver - dns_nameserver=$(echo $dns_nameserver | sed 's/|/\,\ /') + dns_nameserver=$(echo $dns_nameserver | sed 's/|/\,\ /g') if [ -n "$dns_nameserver" ]; then setconfig dns_nameserver \'$dns_nameserver\' echo -e "\033[32m设置成功!!!\033[0m" fi elif [ "$num" = 2 ]; then read -p "请输入新的DNS > " dns_fallback - dns_fallback=$(echo $dns_fallback | sed 's/|/\,\ /') + dns_fallback=$(echo $dns_fallback | sed 's/|/\,\ /g') if [ -n "$dns_fallback" ]; then setconfig dns_fallback \'$dns_fallback\' echo -e "\033[32m设置成功!!!\033[0m" diff --git a/scripts/start.sh b/scripts/start.sh index 86ba08c..d143eda 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -218,9 +218,9 @@ modify_yaml(){ b=$(grep -n "^prox" $yaml | head -1 | cut -d ":" -f 1) b=$((b-1)) mkdir -p $tmpdir > /dev/null - sed "${a},${b}d" $yaml > $tmpdir/rule.yaml + sed "${a},${b}d" $yaml > $tmpdir/proxy.yaml #跳过本地tls证书验证 - [ "$skip_cert" = "已开启" ] && sed -i '10,99s/skip-cert-verify: false/skip-cert-verify: true/' $tmpdir/rule.yaml + [ "$skip_cert" = "已开启" ] && sed -i '10,99s/skip-cert-verify: false/skip-cert-verify: true/' $tmpdir/proxy.yaml #添加配置 cat > $tmpdir/set.yaml < $tmpdir/config.yaml + [ -f $clashdir/rules.yaml ] && yaml_rules=$clashdir/rules.yaml + cat $tmpdir/set.yaml $yaml_user $tmpdir/proxy.yaml $yaml_rules > $tmpdir/config.yaml if [ "$tmpdir" != "$bindir" ];then #如果没有使用小闪存模式 cmp -s $tmpdir/config.yaml $yaml [ "$?" != 0 ] && mv -f $tmpdir/config.yaml $yaml || rm -f $tmpdir/config.yaml fi rm -f $tmpdir/set.yaml - rm -f $tmpdir/rule.yaml + rm -f $tmpdir/proxy.yaml } #设置路由规则 start_redir(){