Skip to content

Commit a4bcd45

Browse files
author
233boy
committedApr 22, 2018
support v1.xx update to v2.xx, use [ v2ray link ] get v2ray config link
·
v2.25v2.12
1 parent 7e11e81 commit a4bcd45

File tree

3 files changed

+115
-29
lines changed

3 files changed

+115
-29
lines changed
 

‎tools/v1xx_to_v2xx.sh

+103
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
#!/bin/bash
2+
v2ray_transport=$(sed -n '17p' $backup)
3+
v2ray_port=$(sed -n '19p' $backup)
4+
v2ray_id=$(sed -n '21p' $backup)
5+
v2ray_dynamicPort_start=$(sed -n '23p' $backup)
6+
v2ray_dynamicPort_end=$(sed -n '25p' $backup)
7+
domain=$(sed -n '27p' $backup)
8+
caddy_status=$(sed -n '29p' $backup)
9+
shadowsocks_status=$(sed -n '31p' $backup)
10+
ssport=$(sed -n '33p' $backup)
11+
sspass=$(sed -n '35p' $backup)
12+
ssciphers=$(sed -n '37p' $backup)
13+
blocked_ad_status=$(sed -n '39p' $backup)
14+
ws_path_status=$(sed -n '41p' $backup)
15+
ws_path=$(sed -n '43p' $backup)
16+
proxy_site=$(sed '$!d' $backup)
17+
if [[ $caddy_status == "true" ]]; then
18+
caddy_installed=true
19+
fi
20+
if [[ $shadowsocks_status == "true" ]]; then
21+
shadowsocks=true
22+
fi
23+
if [[ $blocked_ad_status == "true" ]]; then
24+
is_blocked_ad=true
25+
fi
26+
if [[ $ws_path_status == "true" ]]; then
27+
is_ws_path=true
28+
fi
29+
30+
cat >/etc/v2ray/233blog_v2ray_backup.conf <<-EOF
31+
# -----------------------------------
32+
# 警告...请不要修改或删除这个文件...谢谢
33+
# 警告...请不要修改或删除这个文件...谢谢
34+
# 警告...请不要修改或删除这个文件...谢谢
35+
# -----------------------------------
36+
37+
# ---- 再次提醒 ----
38+
# 大胸弟...如果你看到了这个...记得不要修改或更改这个文件
39+
40+
# ---- 说明 ----
41+
# 嗯……这个文件呢，是用来备份一些设置的
42+
# 我懒...不想用 JQ 去解析 JSON....
43+
# 那就把 V2Ray 配置文件的一些重要参数提取出来
44+
# 然后..在修改 V2Ray 配置的时候再重写一下就 OK 啦...
45+
# 嗯…笨笨的方法
46+
47+
# ---- V2Ray 传输协议 -----
48+
v2ray_transport=$v2ray_transport
49+
50+
#---- V2Ray 端口 -----
51+
v2ray_port=$v2ray_port
52+
53+
#---- UUID -----
54+
v2ray_id=$v2ray_port
55+
56+
#---- alterId -----
57+
alterId=233
58+
59+
#---- V2Ray 动态端口开始 -----
60+
v2ray_dynamicPort_start=$v2ray_dynamicPort_start
61+
62+
#---- V2Ray 动态端口结束 -----
63+
v2ray_dynamicPort_end=$v2ray_dynamicPort_end
64+
65+
#---- 域名 -----
66+
domain=$domain
67+
68+
#---- caddy -----
69+
caddy_status=$caddy_installed
70+
71+
#---- Shadowsocks -----
72+
shadowsocks_status=$shadowsocks
73+
74+
#---- Shadowsocks 端口 -----
75+
ssport=$ssport
76+
77+
#---- Shadowsocks 密码 -----
78+
sspass=$sspass
79+
80+
#---- Shadowsocks 加密协议 -----
81+
ssciphers=$ssciphers
82+
83+
#---- 屏蔽广告 -----
84+
blocked_ad_status=$is_blocked_ad
85+
86+
#---- 网站伪装 -----
87+
ws_path_status=$is_ws_path
88+
89+
#---- 伪装的路径 -----
90+
ws_path=$ws_path
91+
92+
#---- 伪装的网址 -----
93+
proxy_site=$proxy_site
94+
EOF
95+
cp -f /etc/v2ray/233boy/v2ray/v2ray.sh /usr/local/bin/v2ray
96+
chmod +x /usr/local/bin/v2ray
97+
rm -rf $backup
98+
echo
99+
echo -e " 哇哦.. 由于大佬你是从 1.xx 升级到 2.xx 管理脚本的.."
100+
echo
101+
echo -e " 请使用命令$yellow v2ray reload $none重新加载配置...以避免发生莫名其妙的问题"
102+
echo
103+
exit 1

‎v2ray.old.sh

+2-15
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ none='\e[0m'
1010
# Root
1111
[[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1
1212

13-
_version="v1.72"
13+
_version="v1.73"
1414

1515
cmd="apt-get"
1616

@@ -46,20 +46,7 @@ backup="/etc/v2ray/233blog_v2ray_backup.txt"
4646

4747
if [[ -f /usr/bin/v2ray/v2ray && -f /etc/v2ray/config.json ]] && [[ -f $backup && -d /etc/v2ray/233boy/v2ray ]]; then
4848

49-
v2ray_transport=$(sed -n '17p' $backup)
50-
v2ray_port=$(sed -n '19p' $backup)
51-
v2ray_id=$(sed -n '21p' $backup)
52-
v2ray_dynamicPort_start=$(sed -n '23p' $backup)
53-
v2ray_dynamicPort_end=$(sed -n '25p' $backup)
54-
domain=$(sed -n '27p' $backup)
55-
caddy_status=$(sed -n '29p' $backup)
56-
shadowsocks_status=$(sed -n '31p' $backup)
57-
ssport=$(sed -n '33p' $backup)
58-
sspass=$(sed -n '35p' $backup)
59-
ssciphers=$(sed -n '37p' $backup)
60-
blocked_ad_status=$(sed -n '39p' $backup)
61-
ws_path_status=$(sed -n '41p' $backup)
62-
ws_path=$(sed -n '43p' $backup)
49+
. /etc/v2ray/233boy/v2ray/tools/v1xx_to_v2xx.sh
6350

6451
v2ray_ver=$(/usr/bin/v2ray/v2ray -version | head -n 1 | cut -d " " -f2)
6552

‎v2ray.sh

+10-14
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ none='\e[0m'
1010
# Root
1111
[[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1
1212

13-
_version="v2.02"
13+
_version="v2.1"
1414

1515
cmd="apt-get"
1616

@@ -51,14 +51,8 @@ if [[ -f /usr/bin/v2ray/v2ray && -f /etc/v2ray/config.json ]] && [[ -f $backup &
5151

5252
elif [[ -f /usr/bin/v2ray/v2ray && -f /etc/v2ray/config.json ]] && [[ -f /etc/v2ray/233blog_v2ray_backup.txt && -d /etc/v2ray/233boy/v2ray ]]; then
5353

54-
cp -f /etc/v2ray/233boy/v2ray/v2ray.old.sh /usr/local/bin/v2ray
55-
chmod +x /usr/local/bin/v2ray
56-
echo
57-
echo -e " 哇哦.. 出现了一点小意外.. 当前环境不能使用$cyan v2.0 $none版本以上的管理脚本.. 已自动回退到旧版本"
58-
echo
59-
echo -e " 请使用命令$yellow v2ray reload $none重新加载配置...以避免发生莫名其妙的问题"
60-
echo
61-
exit 1
54+
. /etc/v2ray/233boy/v2ray/tools/v1xx_to_v2xx.sh
55+
6256
else
6357
echo -e " 哎呀哎呀…… ${red}出错咯...请重新安装V2Ray${none} ${yellow}~(^_^) ${none}" && exit 1
6458
fi
@@ -2266,15 +2260,16 @@ get_v2ray_config_link() {
22662260
echo -e "$green 正在生成链接.... 稍等片刻即可....$none"
22672261
echo
22682262
local random=$(echo $RANDOM-$RANDOM-$RANDOM | base64)
2269-
local link=$(curl -s --upload-file /etc/v2ray/233blog_v2ray.zip "https://transfer.sh/${random}_233blog_v2ray.zip")
2263+
# local link=$(curl -s --upload-file /etc/v2ray/233blog_v2ray.zip "https://transfer.sh/${random}_233blog_v2ray.zip")
2264+
local link=$(curl -s --upload-file $v2ray_client_config "https://transfer.sh/${random}_233blog_v2ray.json")
22702265
if [[ $link ]]; then
22712266
echo
22722267
echo "---------- V2Ray 客户端配置文件链接 -------------"
22732268
echo
22742269
echo -e "$yellow 链接 = $cyan$link$none"
22752270
echo
2276-
echo -e "$yellow 解压密码 = ${cyan}233blog.com$none"
2277-
echo
2271+
# echo -e "$yellow 解压密码 = ${cyan}233blog.com$none"
2272+
# echo
22782273
echo -e "$yellow SOCKS 监听端口 = ${cyan}2333${none}"
22792274
echo
22802275
echo -e "${yellow} HTTP 监听端口 = ${cyan}6666$none"
@@ -3461,7 +3456,7 @@ config() {
34613456
sed -i "s/233blog.com/$ip/; 22s/2333/$v2ray_port/; 25s/$old_id/$v2ray_id/; 26s/233/$alterId/" $v2ray_client_config
34623457
fi
34633458

3464-
zip -q -r -j --password "233blog.com" /etc/v2ray/233blog_v2ray.zip $v2ray_client_config
3459+
# zip -q -r -j --password "233blog.com" /etc/v2ray/233blog_v2ray.zip $v2ray_client_config
34653460

34663461
if [[ $new_shadowsocks ]]; then
34673462
open_port $new_ssport
@@ -3578,7 +3573,8 @@ _boom_() {
35783573
local random1=$(echo $RANDOM-$RANDOM-$RANDOM | base64)
35793574
local random2=$(echo $RANDOM-$RANDOM-$RANDOM | base64)
35803575
local random3=$(echo $RANDOM-$RANDOM-$RANDOM | base64)
3581-
local link1=$(curl -s --upload-file /etc/v2ray/233blog_v2ray.zip "https://transfer.sh/${random1}_233blog_v2ray.zip")
3576+
# local link1=$(curl -s --upload-file /etc/v2ray/233blog_v2ray.zip "https://transfer.sh/${random1}_233blog_v2ray.zip")
3577+
local link1=$(curl -s --upload-file $v2ray_client_config "https://transfer.sh/${random1}_233blog_v2ray.json")
35823578
local link2=$(curl -s --upload-file /tmp/233blog_v2ray.txt "https://transfer.sh/${random2}_233blog_v2ray.txt")
35833579
local link3=$(curl -s --upload-file /tmp/233blog_v2ray.png "https://transfer.sh/${random3}_233blog_v2ray.png")
35843580

0 commit comments

Comments
 (0)
Please sign in to comment.