From ec9a353de15e8f9a5a3e6e462a510ebf2f035c90 Mon Sep 17 00:00:00 2001 From: 233boy Date: Sat, 11 Aug 2018 11:38:42 +0800 Subject: [PATCH] bug fix --- install.sh | 8 +++++++- v2ray.sh | 16 +++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index f6f9429..d2a4cb8 100644 --- a/install.sh +++ b/install.sh @@ -159,6 +159,8 @@ v2ray_dynamic_port_start() { $v2ray_port) echo echo " 不能和 V2Ray 端口一毛一样...." + echo + echo -e " 当前 V2Ray 端口:${cyan}$v2ray_port${none}" error ;; [1-9] | [1-9][0-9] | [1-9][0-9][0-9] | [1-9][0-9][0-9][0-9] | [1-5][0-9][0-9][0-9][0-9] | 6[0-4][0-9][0-9][0-9] | 65[0-4][0-9][0-9] | 655[0-3][0-5]) @@ -194,10 +196,14 @@ v2ray_dynamic_port_end() { if [[ $v2ray_dynamic_port_end_input -le $v2ray_dynamic_port_start_input ]]; then echo echo " 不能小于或等于 V2Ray 动态端口开始范围" + echo + echo -e " 当前 V2Ray 动态端口开始:${cyan}$v2ray_dynamic_port_start_input${none}" error elif [ $lt_v2ray_port ] && [[ ${v2ray_dynamic_port_end_input} -ge $v2ray_port ]]; then echo echo " V2Ray 动态端口结束范围 不能包括 V2Ray 端口..." + echo + echo -e " 当前 V2Ray 端口:${cyan}$v2ray_port${none}" error else echo @@ -279,7 +285,7 @@ tls_config() { ;; 443) echo - echo " ..都说了不能选择 433 端口了咯....." + echo " ..都说了不能选择 443 端口了咯....." error ;; [1-9] | [1-9][0-9] | [1-9][0-9][0-9] | [1-9][0-9][0-9][0-9] | [1-5][0-9][0-9][0-9][0-9] | 6[0-4][0-9][0-9][0-9] | 65[0-4][0-9][0-9] | 655[0-3][0-5]) diff --git a/v2ray.sh b/v2ray.sh index e9669dc..7468b4a 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="v2.33" +_version="v2.34" cmd="apt-get" @@ -488,6 +488,8 @@ shadowsocks_port_config() { $v2ray_port) echo echo -e " 不能和$cyan V2Ray 端口 $none一毛一样...." + echo + echo -e " 当前 V2Ray 端口:${cyan}$v2ray_port${none}" error ;; [1-9] | [1-9][0-9] | [1-9][0-9][0-9] | [1-9][0-9][0-9][0-9] | [1-5][0-9][0-9][0-9][0-9] | 6[0-4][0-9][0-9][0-9] | 65[0-4][0-9][0-9] | 655[0-3][0-5]) @@ -1545,12 +1547,16 @@ v2ray_dynamic_port_start() { $v2ray_port) echo echo " 不能和 V2Ray 端口一毛一样...." + echo + echo -e " 当前 V2Ray 端口:${cyan}$v2ray_port${none}" error ;; [1-9] | [1-9][0-9] | [1-9][0-9][0-9] | [1-9][0-9][0-9][0-9] | [1-5][0-9][0-9][0-9][0-9] | 6[0-4][0-9][0-9][0-9] | 65[0-4][0-9][0-9] | 655[0-3][0-5]) if [[ $shadowsocks ]] && [[ $v2ray_dynamic_port_start_input == $ssport ]]; then echo echo " 不能和 Shadowsocks 端口一毛一样...." + echo + echo -e " 当前 Shadowsocks 端口:${cyan}$ssport${none}" error else echo @@ -1590,6 +1596,8 @@ v2ray_dynamic_port_end() { if [[ $v2ray_dynamic_port_end_input -le $v2ray_dynamic_port_start_input ]]; then echo echo " 不能小于或等于 V2Ray 动态端口开始范围" + echo + echo -e " 当前 V2Ray 动态端口开始:${cyan}$v2ray_dynamic_port_start_input${none}" error elif [ $lt_v2ray_port ] && [[ ${v2ray_dynamic_port_end_input} -ge $v2ray_port ]]; then echo @@ -1674,12 +1682,16 @@ change_v2ray_dynamic_port_start() { $v2ray_port) echo echo " 不能和 V2Ray 端口一毛一样...." + echo + echo -e " 当前 V2Ray 端口:${cyan}$v2ray_port${none}" error ;; [1-9] | [1-9][0-9] | [1-9][0-9][0-9] | [1-9][0-9][0-9][0-9] | [1-5][0-9][0-9][0-9][0-9] | 6[0-4][0-9][0-9][0-9] | 65[0-4][0-9][0-9] | 655[0-3][0-5]) if [[ $shadowsocks ]] && [[ $v2ray_dynamic_port_start_input == $ssport ]]; then echo echo " 不能和 Shadowsocks 端口一毛一样...." + echo + echo -e " 当前 Shadowsocks 端口:${cyan}$ssport${none}" error else echo @@ -1719,6 +1731,8 @@ change_v2ray_dynamic_port_end() { if [[ $v2ray_dynamic_port_end_input -le $v2ray_dynamic_port_start_input ]]; then echo echo " 不能小于或等于 V2Ray 动态端口开始范围" + echo + echo -e " 当前 V2Ray 动态端口开始:${cyan}$v2ray_dynamic_port_start_input${none}" error elif [ $lt_v2ray_port ] && [[ ${v2ray_dynamic_port_end_input} -ge $v2ray_port ]]; then echo