diff --git a/alpine-network.sh b/alpine-network.sh index 069821a..d21f525 100644 --- a/alpine-network.sh +++ b/alpine-network.sh @@ -102,9 +102,11 @@ echo 'Testing Internet Connection...' for i in $(seq 5); do { if is_need_test_ipv4 && nslookup www.qq.com $ipv4_dns1; then + echo "IPv4 has internet." ipv4_has_internet=true fi if is_need_test_ipv6 && nslookup www.qq.com $ipv6_dns1; then + echo "IPv6 has internet." ipv6_has_internet=true fi if ! is_need_test_ipv4 && ! is_need_test_ipv6; then diff --git a/reinstall.bat b/reinstall.bat index 9b45146..4a5ccd7 100644 --- a/reinstall.bat +++ b/reinstall.bat @@ -13,7 +13,7 @@ cd /d %~dp0 openfiles 1>nul 2>&1 if not !errorlevel! == 0 ( echo Please run as administrator^^! - exit 1 + exit /b ) :: 检查是否国内 @@ -59,7 +59,7 @@ if not exist !tags! ( --root %SystemDrive%\cygwin^ --local-package-dir %tmp%\cygwin-local-package-dir^ --packages !pkgs!^ - && echo >!tags! + && type nul >!tags! ) :: 下载 reinstall.sh diff --git a/trans.sh b/trans.sh index 9ef117a..d17b4e9 100644 --- a/trans.sh +++ b/trans.sh @@ -248,6 +248,13 @@ get_ra_to() { echo "Gathering network info..." _ra="$(rdisc6 -1 eth0)" apk del ndisc6 + + # 显示网络配置 + echo + echo "$_ra" | cat -n + echo + ip addr | cat -n + echo fi eval "$1='$_ra'" } @@ -552,10 +559,6 @@ EOF # 显示网络配置 echo - ip addr | cat -n - echo - echo "$ra" | cat -n - echo cat -n /etc/network/interfaces echo