From 03190a63a1dfc699028b49b8490ee1b1c83a4109 Mon Sep 17 00:00:00 2001 From: wulabing Date: Sun, 16 Feb 2020 00:21:27 +0800 Subject: [PATCH] =?UTF-8?q?1.1.0=20=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index 66869eb..ca0818a 100644 --- a/install.sh +++ b/install.sh @@ -28,6 +28,7 @@ Error="${Red}[错误]${Font}" # 版本 shell_version="1.1.0" shell_mode="None" +github_branch="dev" version_cmp="/tmp/version_cmp.tmp" v2ray_conf_dir="/etc/v2ray" nginx_conf_dir="/etc/nginx/conf/conf.d" @@ -492,7 +493,7 @@ acme(){ } v2ray_conf_add_tls(){ 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_alterid modify_inbound_port @@ -500,7 +501,7 @@ v2ray_conf_add_tls(){ } v2ray_conf_add_h2(){ 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_alterid modify_inbound_port @@ -771,7 +772,7 @@ bbr_boost_sh(){ } mtproxy_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(){ @@ -859,7 +860,7 @@ install_v2_h2(){ } 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 "$shell_version" >> $version_cmp if [[ "$shell_version" < "$(sort -rV $version_cmp | head -1)" ]] @@ -868,7 +869,7 @@ update_sh(){ read -r update_confirm case $update_confirm in [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}" exit 0 ;;