From ee8536c769b50aa5d7fdeb04e8ab032990113f1b Mon Sep 17 00:00:00 2001 From: 233boy Date: Sun, 18 Mar 2018 22:47:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=96=E7=9F=BF=E8=82=AF=E5=AE=9A=E6=98=AF?= =?UTF-8?q?=E4=BC=9A=E6=8C=96=E7=9F=BF=EF=BC=8C=E6=AF=8F=E4=B8=AA=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=83=BD=E4=BC=9A=E6=9C=89=E6=8C=96=E7=9F=BF=E7=9A=84?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 11 ++++++++--- v2ray.sh | 11 +++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index 7217a7b..ce04905 100644 --- a/install.sh +++ b/install.sh @@ -666,7 +666,7 @@ domain_check() { # $cmd install dnsutils -y # fi # test_domain=$(dig $domain +short) - test_domain=$(ping $domain -c 1 | grep -oP -m1 "([\d.]+){3}\d") + test_domain=$(ping $domain -c 1 | grep -oP -m1 "([\d.]+){4}\d") if [[ $test_domain != $ip ]]; then echo echo -e "$red 检测域名解析错误....$none" @@ -755,10 +755,15 @@ $domain { install_v2ray() { $cmd update -y + # if [[ $cmd == "apt-get" ]]; then + # $cmd install -y lrzsz git zip unzip curl wget qrencode dnsutils + # else + # $cmd install -y lrzsz git zip unzip curl wget qrencode bind-utils iptables-services + # fi if [[ $cmd == "apt-get" ]]; then - $cmd install -y lrzsz git zip unzip curl wget qrencode dnsutils + $cmd install -y lrzsz git zip unzip curl wget qrencode else - $cmd install -y lrzsz git zip unzip curl wget qrencode bind-utils iptables-services + $cmd install -y lrzsz git zip unzip curl wget qrencode iptables-services fi ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime diff --git a/v2ray.sh b/v2ray.sh index aa092d3..aa8ee17 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -10,7 +10,7 @@ none='\e[0m' # Root [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 -_version="v1.53" +_version="v1.54" cmd="apt-get" @@ -1838,7 +1838,7 @@ change_proxy_site_config() { } domain_check() { # test_domain=$(dig $new_domain +short) - test_domain=$(ping $new_domain -c 1 | grep -oP -m1 "([\d.]+){3}\d") + test_domain=$(ping $new_domain -c 1 | grep -oP -m1 "([\d.]+){4}\d") if [[ $test_domain != $ip ]]; then echo echo -e "$red 检测域名解析错误....$none" @@ -2583,6 +2583,8 @@ update_v2ray() { echo echo -e " $green 更新成功啦...当前 V2Ray 版本: ${cyan}$v2ray_latest_ver$none" echo + echo -e " $yellow 温馨提示: 为了避免出现莫名其妙的问题...所以客户端 V2Ray 版本最好也是: ${cyan}$v2ray_latest_ver$none" + echo rm -rf /tmp/v2ray else echo @@ -3638,6 +3640,11 @@ un | uninstall) 233 | 2333 | 233boy | 233blog | 233blog.com) _boom_ ;; +v | version) + echo + echo -e " 当前 V2Ray 版本: ${green}$v2ray_ver$none / 当前 V2Ray 管理脚本版本: ${cyan}$_version$none" + echo + ;; bbr) other ;;