From 9cfe907cbe4ea3b9f1b5fb7e188e4430feb0d63c Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Tue, 10 Nov 2020 11:29:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=84=9A=E6=9C=AC):=20=E5=AE=89=E8=A3=85t?= =?UTF-8?q?rojan=E6=B7=BB=E5=8A=A0=E8=BF=9B=E5=BA=A6=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=9B=B4=E6=96=B0trojan-go=E3=80=81=E9=87=8D=E5=90=AF?= =?UTF-8?q?=E6=9C=BA=E5=99=A8=E5=90=8E=E6=97=A0=E6=B3=95=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=81=E4=BF=AE=E6=94=B9trojan=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/install.sh b/install.sh index 8e8c5a5..b542972 100644 --- a/install.sh +++ b/install.sh @@ -592,12 +592,18 @@ installV2Ray(){ # 安装Trojan-go installTrojanGo(){ echoContent skyBlue "\n进度 $1/${totalProgress} : 安装Trojan-Go" - if [[ -z `ls -F /etc/v2ray-agent/trojan/|grep "trojan-go"` ]] || [[ -z `ls -F /etc/v2ray-agent/trojan/|grep "trojan-go"` ]] + if [[ -z `ls -F /etc/v2ray-agent/trojan/|grep -w "trojan-go"` ]] then version=`curl -s https://github.com/p4gefau1t/trojan-go/releases|grep /trojan-go/releases/tag/|head -1|awk -F "[/]" '{print $6}'|awk -F "[>]" '{print $2}'|awk -F "[<]" '{print $1}'` # version="v4.27.4" echoContent green " ---> Trojan-Go版本:${version}" - wget -q -P /etc/v2ray-agent/trojan/ https://github.com/p4gefau1t/trojan-go/releases/download/${version}/trojan-go-linux-amd64.zip + if [[ ! -z `wget --help|grep show-progress` ]] + then + wget -c -q --show-progress -P /etc/v2ray-agent/trojan/ https://github.com/p4gefau1t/trojan-go/releases/download/${version}/trojan-go-linux-amd64.zip + else + wget -c -P /etc/v2ray-agent/trojan/ https://github.com/p4gefau1t/trojan-go/releases/download/${version}/trojan-go-linux-amd64.zip + fi + # wget -q -P /etc/v2ray-agent/trojan/ https://github.com/p4gefau1t/trojan-go/releases/download/${version}/trojan-go-linux-amd64.zip unzip -o /etc/v2ray-agent/trojan/trojan-go-linux-amd64.zip -d /etc/v2ray-agent/trojan > /dev/null rm -rf /etc/v2ray-agent/trojan/trojan-go-linux-amd64.zip else @@ -606,7 +612,7 @@ installTrojanGo(){ read -p "是否重新安装？[y/n]:" reInstalTrojanStatus if [[ "${reInstalV2RayStatus}" = "y" ]] then - rm -rf /etc/v2ray-agent/trojan/* + rm -rf /etc/v2ray-agent/trojan/trojan-go installTrojanGo $1 fi fi @@ -739,13 +745,14 @@ updateTrojanGo(){ then version=`curl -s https://github.com/p4gefau1t/trojan-go/releases|grep /trojan-go/releases/tag/|head -1|awk -F "[/]" '{print $6}'|awk -F "[>]" '{print $2}'|awk -F "[<]" '{print $1}'` echoContent green " ---> Trojan-Go版本:${version}" - wget -q -P /etc/v2ray-agent/trojan/ https://github.com/p4gefau1t/trojan-go/releases/download/${version}/trojan-go-linux-amd64.zip - unzip -o /etc/v2ray-agent/trojan/trojan-go-linux-amd64.zip -d /etc/v2ray-agent/trojan > /dev/null - if [[ "$2" = "backup" ]] + if [[ ! -z `wget --help|grep show-progress` ]] then - cp /tmp/trojan_config.json /etc/v2ray-agent/trojan/config.json + wget -c -q --show-progress -P /etc/v2ray-agent/trojan/ https://github.com/p4gefau1t/trojan-go/releases/download/${version}/trojan-go-linux-amd64.zip + else + wget -c -P /etc/v2ray-agent/trojan/ https://github.com/p4gefau1t/trojan-go/releases/download/${version}/trojan-go-linux-amd64.zip fi - + # wget -q -P /etc/v2ray-agent/trojan/ https://github.com/p4gefau1t/trojan-go/releases/download/${version}/trojan-go-linux-amd64.zip + unzip -o /etc/v2ray-agent/trojan/trojan-go-linux-amd64.zip -d /etc/v2ray-agent/trojan > /dev/null rm -rf /etc/v2ray-agent/trojan/trojan-go-linux-amd64.zip handleTrojanGo stop handleTrojanGo start @@ -763,8 +770,8 @@ updateTrojanGo(){ then handleTrojanGo stop cp /etc/v2ray-agent/trojan/config.json /tmp/trojan_config.json - rm -rf /etc/v2ray-agent/trojan/* - updateTrojanGo $1 backup + rm -rf /etc/v2ray-agent/trojan/trojan-go + updateTrojanGo 1 else echoContent green " ---> 放弃重新安装" fi @@ -772,9 +779,8 @@ updateTrojanGo(){ read -p "最新版本为：${version}，是否更新？[y/n]：" installTrojanGoStatus if [[ "${installTrojanGoStatus}" = "y" ]] then - cp /etc/v2ray-agent/trojan/config.json /tmp/trojan_config.json - rm -rf /etc/v2ray-agent/trojan/* - updateTrojanGo $1 backup + rm -rf /etc/v2ray-agent/trojan/trojan-go + updateTrojanGo 1 else echoContent green " ---> 放弃更新" fi @@ -917,7 +923,7 @@ Type=simple User=root CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_NET_RAW NoNewPrivileges=yes -ExecStart=/etc/v2ray-agent/trojan/trojan-go -config /etc/v2ray-agent/trojan/config.json +ExecStart=/etc/v2ray-agent/trojan/trojan-go -config /etc/v2ray-agent/trojan/config_full.json Restart=on-failure RestartPreventExitStatus=23 @@ -1434,7 +1440,7 @@ EOF initTrojanGoConfig(){ # uuidTrojanGo=`/etc/v2ray-agent/v2ray/v2ctl uuid` echoContent skyBlue "\n进度 $1/${totalProgress} : 初始化Trojan配置" - cat << EOF > /etc/v2ray-agent/trojan/config.json + cat << EOF > /etc/v2ray-agent/trojan/config_full.json { "run_type": "server", "local_addr": "127.0.0.1", @@ -1745,12 +1751,12 @@ showAccounts(){ fi fi - if [[ -d "/etc/v2ray-agent/" ]] && [[ -d "/etc/v2ray-agent/trojan/" ]] && [[ -f "/etc/v2ray-agent/trojan/config.json" ]] + if [[ -d "/etc/v2ray-agent/" ]] && [[ -d "/etc/v2ray-agent/trojan/" ]] && [[ -f "/etc/v2ray-agent/trojan/config_full.json" ]] then showStatus=true - local trojanUUID=`cat /etc/v2ray-agent/trojan/config.json |jq .password[0]|awk -F '["]' '{print $2}'` - local trojanGoPath=`cat /etc/v2ray-agent/trojan/config.json|jq .websocket.path|awk -F '["]' '{print $2}'` - local trojanGoAdd=`cat /etc/v2ray-agent/trojan/config.json|jq .websocket.add|awk -F '["]' '{print $2}'` + local trojanUUID=`cat /etc/v2ray-agent/trojan/config_full.json |jq .password[0]|awk -F '["]' '{print $2}'` + local trojanGoPath=`cat /etc/v2ray-agent/trojan/config_full.json|jq .websocket.path|awk -F '["]' '{print $2}'` + local trojanGoAdd=`cat /etc/v2ray-agent/trojan/config_full.json|jq .websocket.add|awk -F '["]' '{print $2}'` echoContent skyBlue "\n================================== Trojan TLS ==================================" defaultBase64Code trojan trojan ${trojanUUID} ${host}