From e0be1f6587322df1d34841860f370ffa78db964f Mon Sep 17 00:00:00 2001 From: 233boy Date: Sat, 5 May 2018 22:42:17 +0800 Subject: [PATCH 1/5] update download config filename --- v2ray.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/v2ray.sh b/v2ray.sh index a958d2a..368f8bb 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.15" +_version="v2.16" cmd="apt-get" @@ -2296,6 +2296,7 @@ download_v2ray_config() { done } get_v2ray_config() { + config echo echo " 如果你当前使用的 SSH 客户端不是 Xshell 的话...下载 V2Ray 客户端配置文件将会出现卡死情况" echo @@ -2309,7 +2310,9 @@ get_v2ray_config() { echo "开始下载....请选择 V2Ray 客户端配置文件保存位置" echo # sz /etc/v2ray/233blog_v2ray.zip - sz $v2ray_client_config + local tmpfile="/tmp/233blog_v2ray_config_$(date +"%F-%T").json" + cp -f $v2ray_client_config $tmpfile + sz $tmpfile echo echo echo -e "$green 下载完成咯...$none" @@ -2328,6 +2331,8 @@ get_v2ray_config() { fi fi done + [[ -f $tmpfile ]] && rm -rf $tmpfile + } get_v2ray_config_link() { echo From 3abdf6aa44055b9b3e1cca89d4823fa46d37f9af Mon Sep 17 00:00:00 2001 From: 233boy Date: Sat, 5 May 2018 23:16:48 +0800 Subject: [PATCH 2/5] bug fix --- v2ray.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v2ray.sh b/v2ray.sh index 368f8bb..c4e64bf 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.16" +_version="v2.17" cmd="apt-get" @@ -2310,7 +2310,7 @@ get_v2ray_config() { echo "开始下载....请选择 V2Ray 客户端配置文件保存位置" echo # sz /etc/v2ray/233blog_v2ray.zip - local tmpfile="/tmp/233blog_v2ray_config_$(date +"%F-%T").json" + local tmpfile="/tmp/233blog_v2ray_config_$RANDOM.json" cp -f $v2ray_client_config $tmpfile sz $tmpfile echo From 1268ebbd1edb260019ca8d1ffea2b3a4b1ee7297 Mon Sep 17 00:00:00 2001 From: 233boy Date: Sat, 5 May 2018 23:29:38 +0800 Subject: [PATCH 3/5] skip cache --- v2ray.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/v2ray.sh b/v2ray.sh index c4e64bf..65173ac 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.17" +_version="v2.18" cmd="apt-get" @@ -2731,7 +2731,7 @@ update_v2ray() { mkdir -p /tmp/v2ray v2ray_tmp_file="/tmp/v2ray/v2ray.zip" - v2ray_latest_ver="$(curl -s https://api.github.com/repos/v2ray/v2ray-core/releases/latest | grep 'tag_name' | cut -d\" -f4)" + v2ray_latest_ver="$(curl -s "https://api.github.com/repos/v2ray/v2ray-core/releases/latest?r=$RANDOM" | grep 'tag_name' | cut -d\" -f4)" if [[ $v2ray_ver != $v2ray_latest_ver ]]; then echo echo -e " $green 咦...发现新版本耶....正在拼命更新.......$none" @@ -2766,7 +2766,7 @@ update_v2ray() { fi } update_v2ray.sh() { - local latest_version=$(curl -s -L https://raw.githubusercontent.com/233boy/v2ray/master/v2ray.sh | grep '_version' -m1 | cut -d\" -f2) + local latest_version=$(curl -s -L "https://raw.githubusercontent.com/233boy/v2ray/master/v2ray.sh?r=$RANDOM" | grep '_version' -m1 | cut -d\" -f2) if [[ $latest_version == $_version ]]; then echo echo -e "$green 木有发现新版本 $none" From a5a67f68b307f3ee5f942b2fe9b61939b906578e Mon Sep 17 00:00:00 2001 From: 233boy Date: Sat, 5 May 2018 23:41:26 +0800 Subject: [PATCH 4/5] [add] v2ray reinstall --- v2ray.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/v2ray.sh b/v2ray.sh index 65173ac..69e823b 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.18" +_version="v2.19" cmd="apt-get" @@ -3606,6 +3606,10 @@ U | update.sh) un | uninstall) uninstall_v2ray ;; +reinstall) + uninstall_v2ray + [[ $is_uninstall_v2ray ]] && bash <(curl -s -L https://233blog.com/v2ray.sh) + ;; 233 | 2333 | 233boy | 233blog | 233blog.com) _boom_ ;; From 01a308331230833c2aca9e7e67892364b9e6a958 Mon Sep 17 00:00:00 2001 From: 233boy Date: Sun, 6 May 2018 00:10:49 +0800 Subject: [PATCH 5/5] bug fix --- install.sh | 2 +- v2ray.sh | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 85b3a80..2130c52 100644 --- a/install.sh +++ b/install.sh @@ -1281,7 +1281,7 @@ config() { backup_config() { sed -i "18s/=1/=$v2ray_transport_opt/; 21s/=2333/=$v2ray_port/; 24s/=$old_id/=$uuid/" $backup - if [ $v2ray_transport_opt -ge 9 && $v2ray_transport_opt -le 15 ]; then + if [[ $v2ray_transport_opt -ge 9 && $v2ray_transport_opt -le 15 ]]; then sed -i "30s/=10000/=$v2ray_dynamic_port_start_input/; 33s/=20000/=$v2ray_dynamic_port_end_input/" $backup fi if [ $shadowsocks ]; then diff --git a/v2ray.sh b/v2ray.sh index 69e823b..1efc308 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.19" +_version="v2.20" cmd="apt-get" @@ -3608,7 +3608,10 @@ un | uninstall) ;; reinstall) uninstall_v2ray - [[ $is_uninstall_v2ray ]] && bash <(curl -s -L https://233blog.com/v2ray.sh) + if [[ $is_uninstall_v2ray ]]; then + cd; cd - >/dev/null 2>&1 + bash <(curl -s -L https://233blog.com/v2ray.sh) + fi ;; 233 | 2333 | 233boy | 233blog | 233blog.com) _boom_