diff --git a/serv00.sh b/serv00.sh index a194090..1608fa1 100644 --- a/serv00.sh +++ b/serv00.sh @@ -455,7 +455,7 @@ get_argodomain() { local argodomain="" while [[ $retry -lt $max_retries ]]; do ((retry++)) - argodomain=$(grep -oE 'https://[[:alnum:]+\.-]+\.trycloudflare\.com' boot.log 2>/dev/null | sed 's@https://@@') + argodomain=$(cat boot.log 2>/dev/null | grep -a trycloudflare.com | awk 'NR==2{print}' | awk -F// '{print $2}' | awk '{print $1}') if [[ -n $argodomain ]]; then break fi @@ -1149,7 +1149,7 @@ echo if [[ -e $WORKDIR/list.txt ]]; then green "已安装sing-box" ps aux | grep '[c]onfig' > /dev/null && green "主进程运行正常" || yellow "主进程启动中…………2分钟后可再次进入脚本查看" -if [ -f "$WORKDIR/boot.log" ] && grep -q "trycloudflare.com" "$WORKDIR/boot.log" 2>/dev/null && ps aux | grep [l]ocalhost > /dev/null; then +if [ -f "$WORKDIR/boot.log" ] && cat "$WORKDIR/boot.log" 2>/dev/null | grep -a trycloudflare.com | awk 'NR==2{print}' | awk -F// '{print $2}' | awk '{print $1}' && ps aux | grep [l]ocalhost > /dev/null; then argosl=$(grep -oE 'https://[[:alnum:]+\.-]+\.trycloudflare\.com' $WORKDIR/boot.log 2>/dev/null | sed 's@https://@@') checkhttp=$(curl -o /dev/null -s -w "%{http_code}\n" "https://$argosl") [ "$checkhttp" -eq 404 ] && check="域名有效" || check="域名可能无效"