github
/
Xray_onekey
mirror of https://github.com/wulabing/Xray_onekey
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

1.1.0 逻辑优化

pull/175/head^2
wulabing 2020-02-16 00:21:27 +08:00
parent 69041031a9
commit 03190a63a1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
install.sh
View File

@ -28,6 +28,7 @@ Error="${Red}[错误]${Font}"
# 版本 # 版本
shell_version="1.1.0" shell_version="1.1.0"
shell_mode="None" shell_mode="None"
github_branch="dev"
version_cmp="/tmp/version_cmp.tmp" version_cmp="/tmp/version_cmp.tmp"
v2ray_conf_dir="/etc/v2ray" v2ray_conf_dir="/etc/v2ray"
nginx_conf_dir="/etc/nginx/conf/conf.d" nginx_conf_dir="/etc/nginx/conf/conf.d"
@ -492,7 +493,7 @@ acme(){
} }
v2ray_conf_add_tls(){ v2ray_conf_add_tls(){
cd /etc/v2ray cd /etc/v2ray
wget --no-check-certificate https://raw.githubusercontent.com/wulabing/V2Ray_ws-tls_bash_onekey/master/tls/config.json -O config.json wget --no-check-certificate https://raw.githubusercontent.com/wulabing/V2Ray_ws-tls_bash_onekey/${github_branch}/tls/config.json -O config.json
modify_path modify_path
modify_alterid modify_alterid
modify_inbound_port modify_inbound_port
@ -500,7 +501,7 @@ v2ray_conf_add_tls(){
} }
v2ray_conf_add_h2(){ v2ray_conf_add_h2(){
cd /etc/v2ray cd /etc/v2ray
wget --no-check-certificate https://raw.githubusercontent.com/wulabing/V2Ray_ws-tls_bash_onekey/master/http2/config.json -O config.json wget --no-check-certificate https://raw.githubusercontent.com/wulabing/V2Ray_ws-tls_bash_onekey/${github_branch}/http2/config.json -O config.json
modify_path modify_path
modify_alterid modify_alterid
modify_inbound_port modify_inbound_port
@ -771,7 +772,7 @@ bbr_boost_sh(){
} }
mtproxy_sh(){ mtproxy_sh(){
[ -f "mtproxy_go.sh" ] && rm -rf ./mtproxy_go.sh [ -f "mtproxy_go.sh" ] && rm -rf ./mtproxy_go.sh
wget -N --no-check-certificate https://github.com/whunt1/onekeymakemtg/raw/master/mtproxy_go.sh && chmod +x mtproxy_go.sh && ./mtproxy_go.sh wget -N --no-check-certificate https://github.com/whunt1/onekeymakemtg/raw/${github_branch}/mtproxy_go.sh && chmod +x mtproxy_go.sh && ./mtproxy_go.sh
} }
uninstall_all(){ uninstall_all(){
@ -859,7 +860,7 @@ install_v2_h2(){
} }
update_sh(){ update_sh(){
ol_version=$(curl -L -s https://raw.githubusercontent.com/wulabing/V2Ray_ws-tls_bash_onekey/master/install.sh | grep "shell_version=" | head -1 |awk -F '=|"' '{print $3}') ol_version=$(curl -L -s https://raw.githubusercontent.com/wulabing/V2Ray_ws-tls_bash_onekey/${github_branch}/install.sh | grep "shell_version=" | head -1 |awk -F '=|"' '{print $3}')
echo "$ol_version" > $version_cmp echo "$ol_version" > $version_cmp
echo "$shell_version" >> $version_cmp echo "$shell_version" >> $version_cmp
if [[ "$shell_version" < "$(sort -rV $version_cmp | head -1)" ]] if [[ "$shell_version" < "$(sort -rV $version_cmp | head -1)" ]]
@ -868,7 +869,7 @@ update_sh(){
read -r update_confirm read -r update_confirm
case $update_confirm in case $update_confirm in
[yY][eE][sS]|[yY]) [yY][eE][sS]|[yY])
wget -N --no-check-certificate https://raw.githubusercontent.com/wulabing/V2Ray_ws-tls_bash_onekey/master/install.sh wget -N --no-check-certificate https://raw.githubusercontent.com/wulabing/V2Ray_ws-tls_bash_onekey/${github_branch}/install.sh
echo -e "${OK} ${Green} 更新完成 ${Font}" echo -e "${OK} ${Green} 更新完成 ${Font}"
exit 0 exit 0
;; ;;