From 42c06798ffa71ac2a67523e23754d63e7d0f9faf Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Tue, 22 Dec 2020 11:35:32 +0800 Subject: [PATCH 1/8] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 50 ++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..304a8d2 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,50 @@ +--- +name: Bug report +about: 创建issues +title: '' +labels: '' +assignees: '' + +--- + +>下方留下相关的描述即可 +**描述出现的问题** +``` +# +``` +**是否直接安装失败** +- 是 +- 否 + +**直接安装失败的错误内容或者截图** +- 此项没有可忽略 + +**系统版本【例：Centos8】** +>下列系统版本需自己补全 +- Centos8 + +**安装类型** +- 安装 +- 个性化安装 + +**安装的核心版本** +>version位置需自己替换 +- Xray-core【version】 +- v2ray-core【version】 +- v2ray-core[XTLS] + +**出现问题的协议类型** +- VLESS+XTLS +- VLESS+TLS+WS +- VMess+TLS+WS +- VMess+TLS+TCP +- Trojan +- Trojan-go+ws + +**尝试重装后是否100%复现** +- 是 +- 否 + +**是否仔细检查客户端与服务端的配置是否相同** +- 是 +- 否 From 631a05f2b720f59f2c74b8b296518b3027984edc Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Tue, 22 Dec 2020 11:36:58 +0800 Subject: [PATCH 2/8] Update issue templates --- .github/ISSUE_TEMPLATE/----.md | 52 ++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/----.md diff --git a/.github/ISSUE_TEMPLATE/----.md b/.github/ISSUE_TEMPLATE/----.md new file mode 100644 index 0000000..61773f2 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/----.md @@ -0,0 +1,52 @@ +--- +name: 反馈问题 +about: 创建issues +title: '' +labels: '' +assignees: '' + +--- + +>下方留下相关的描述即可 + +**1.描述出现的问题** +``` +# +``` + +**2.是否直接安装失败** +- 是 +- 否 + +**3.直接安装失败的错误内容或者截图** +- 此项没有可忽略 + +**4.系统版本【例：Centos8】** +>下列系统版本需自己补全 +- Centos8 + +**5.安装类型** +- 安装 +- 个性化安装 + +**6.安装的核心版本** +>version位置需自己替换 +- Xray-core【version】 +- v2ray-core【version】 +- v2ray-core[XTLS] + +**7.出现问题的协议类型** +- VLESS+XTLS +- VLESS+TLS+WS +- VMess+TLS+WS +- VMess+TLS+TCP +- Trojan +- Trojan-go+ws + +**8.尝试重装后是否100%复现** +- 是 +- 否 + +**9.是否仔细检查客户端与服务端的配置是否相同** +- 是 +- 否 From d143e39d4a8c12d90a5dfb7fb79c117fb35dd88e Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Tue, 22 Dec 2020 11:38:37 +0800 Subject: [PATCH 3/8] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 50 ---------------------------- 1 file changed, 50 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 304a8d2..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,50 +0,0 @@ ---- -name: Bug report -about: 创建issues -title: '' -labels: '' -assignees: '' - ---- - ->下方留下相关的描述即可 -**描述出现的问题** -``` -# -``` -**是否直接安装失败** -- 是 -- 否 - -**直接安装失败的错误内容或者截图** -- 此项没有可忽略 - -**系统版本【例：Centos8】** ->下列系统版本需自己补全 -- Centos8 - -**安装类型** -- 安装 -- 个性化安装 - -**安装的核心版本** ->version位置需自己替换 -- Xray-core【version】 -- v2ray-core【version】 -- v2ray-core[XTLS] - -**出现问题的协议类型** -- VLESS+XTLS -- VLESS+TLS+WS -- VMess+TLS+WS -- VMess+TLS+TCP -- Trojan -- Trojan-go+ws - -**尝试重装后是否100%复现** -- 是 -- 否 - -**是否仔细检查客户端与服务端的配置是否相同** -- 是 -- 否 From 3a353b2c3d5c97301380671bef0cb756ed427f65 Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Tue, 22 Dec 2020 11:42:51 +0800 Subject: [PATCH 4/8] Update issue templates --- .github/ISSUE_TEMPLATE/----.md | 48 +++------------------------------- 1 file changed, 3 insertions(+), 45 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/----.md b/.github/ISSUE_TEMPLATE/----.md index 61773f2..7486823 100644 --- a/.github/ISSUE_TEMPLATE/----.md +++ b/.github/ISSUE_TEMPLATE/----.md @@ -1,52 +1,10 @@ --- -name: 反馈问题 -about: 创建issues +name: 提交建议 +about: 对这个项目提出一个建议 title: '' labels: '' assignees: '' --- ->下方留下相关的描述即可 - -**1.描述出现的问题** -``` -# -``` - -**2.是否直接安装失败** -- 是 -- 否 - -**3.直接安装失败的错误内容或者截图** -- 此项没有可忽略 - -**4.系统版本【例：Centos8】** ->下列系统版本需自己补全 -- Centos8 - -**5.安装类型** -- 安装 -- 个性化安装 - -**6.安装的核心版本** ->version位置需自己替换 -- Xray-core【version】 -- v2ray-core【version】 -- v2ray-core[XTLS] - -**7.出现问题的协议类型** -- VLESS+XTLS -- VLESS+TLS+WS -- VMess+TLS+WS -- VMess+TLS+TCP -- Trojan -- Trojan-go+ws - -**8.尝试重装后是否100%复现** -- 是 -- 否 - -**9.是否仔细检查客户端与服务端的配置是否相同** -- 是 -- 否 +**详细描述建议的内容** From 47e93b49ebaad76b0e8053739c55e2d8aa252651 Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Tue, 22 Dec 2020 11:44:47 +0800 Subject: [PATCH 5/8] Update issue templates --- .github/ISSUE_TEMPLATE/----.md | 2 +- .github/ISSUE_TEMPLATE/bug--.md | 52 +++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 .github/ISSUE_TEMPLATE/bug--.md diff --git a/.github/ISSUE_TEMPLATE/----.md b/.github/ISSUE_TEMPLATE/----.md index 7486823..9751fa2 100644 --- a/.github/ISSUE_TEMPLATE/----.md +++ b/.github/ISSUE_TEMPLATE/----.md @@ -2,7 +2,7 @@ name: 提交建议 about: 对这个项目提出一个建议 title: '' -labels: '' +labels: enhancement assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/bug--.md b/.github/ISSUE_TEMPLATE/bug--.md new file mode 100644 index 0000000..59bc705 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug--.md @@ -0,0 +1,52 @@ +--- +name: bug反馈 +about: bug反馈 +title: '' +labels: bug +assignees: '' + +--- + +>下方留下相关的描述即可 + +**1.描述出现的问题** +``` +# +``` + +**2.是否直接安装失败** +- 是 +- 否 + +**3.直接安装失败的错误内容或者截图** +- 此项没有可忽略 + +**4.系统版本【例：Centos8】** +>下列系统版本需自己补全 +- Centos8 + +**5.安装类型** +- 安装 +- 个性化安装 + +**6.安装的核心版本** +>version位置需自己替换 +- Xray-core【version】 +- v2ray-core【version】 +- v2ray-core[XTLS] + +**7.出现问题的协议类型** +- VLESS+XTLS +- VLESS+TLS+WS +- VMess+TLS+WS +- VMess+TLS+TCP +- Trojan +- Trojan-go+ws + +**8.尝试重装后是否100%复现** +- 是 +- 否 + +**9.是否仔细检查客户端与服务端的配置是否相同** +- 是 +- 否 From 4c1ded6fe2d6be6db1ad7d799ddcdee302e3867a Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Tue, 22 Dec 2020 11:49:54 +0800 Subject: [PATCH 6/8] Update issue templates --- .github/ISSUE_TEMPLATE/bug--.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug--.md b/.github/ISSUE_TEMPLATE/bug--.md index 59bc705..90833ce 100644 --- a/.github/ISSUE_TEMPLATE/bug--.md +++ b/.github/ISSUE_TEMPLATE/bug--.md @@ -25,17 +25,21 @@ assignees: '' >下列系统版本需自己补全 - Centos8 -**5.安装类型** +**5.脚本版本** +>下列系统版本需自己补全 +- Centos8 + +**6.安装类型** - 安装 - 个性化安装 -**6.安装的核心版本** +**7.安装的核心版本** >version位置需自己替换 - Xray-core【version】 - v2ray-core【version】 - v2ray-core[XTLS] -**7.出现问题的协议类型** +**8.出现问题的协议类型** - VLESS+XTLS - VLESS+TLS+WS - VMess+TLS+WS @@ -43,10 +47,10 @@ assignees: '' - Trojan - Trojan-go+ws -**8.尝试重装后是否100%复现** +**9.尝试重装后是否100%复现** - 是 - 否 -**9.是否仔细检查客户端与服务端的配置是否相同** +**10.是否仔细检查客户端与服务端的配置是否相同** - 是 - 否 From 172f2064f42286c934e3b3b4526f0e4ebc6c0422 Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Tue, 22 Dec 2020 11:50:42 +0800 Subject: [PATCH 7/8] Update issue templates --- .github/ISSUE_TEMPLATE/bug--.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug--.md b/.github/ISSUE_TEMPLATE/bug--.md index 90833ce..40ff41d 100644 --- a/.github/ISSUE_TEMPLATE/bug--.md +++ b/.github/ISSUE_TEMPLATE/bug--.md @@ -26,8 +26,7 @@ assignees: '' - Centos8 **5.脚本版本** ->下列系统版本需自己补全 -- Centos8 +- **6.安装类型** - 安装 From 375502f895df7e2482f4503bd59bb9d92a706133 Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Tue, 22 Dec 2020 14:11:55 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9ping=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9Ubuntu=E5=91=BD=E4=BB=A4=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E8=AF=81=E4=B9=A6=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=AE=89=E8=A3=85=E8=BF=98=E6=98=AF=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=97=A7=E8=AF=81=E4=B9=A6=E9=97=AE=E9=A2=98=E3=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=89=E8=A3=85ping6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/install.sh b/install.sh index d3e90d6..951221c 100644 --- a/install.sh +++ b/install.sh @@ -19,9 +19,9 @@ checkSystem(){ elif [[ ! -z `cat /etc/issue | grep -i "ubuntu" | grep -v grep` ]] || [[ ! -z `cat /proc/version | grep -i "ubuntu" | grep -v grep` ]] then release="ubuntu" - installType='apt -y install' - upgrade="apt update -y" - removeType='apt --purge remove' + installType='apt-get -y install' + upgrade="apt-get update -y" + removeType='apt-get --purge remove' fi if [[ -z ${release} ]] then @@ -340,31 +340,31 @@ installTools(){ if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep -w wget` ]] then echoContent green " ---> 安装wget" - ${installType} wget > /dev/null + ${installType} wget > /dev/null 2>&1 fi if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep -w curl` ]] then echoContent green " ---> 安装curl" - ${installType} curl > /dev/null + ${installType} curl > /dev/null 2>&1 fi if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep -w unzip` ]] then echoContent green " ---> 安装unzip" - ${installType} unzip > /dev/null + ${installType} unzip > /dev/null 2>&1 fi if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep -w socat` ]] then echoContent green " ---> 安装socat" - ${installType} socat > /dev/null + ${installType} socat > /dev/null 2>&1 fi if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep -w tar` ]] then echoContent green " ---> 安装tar" - ${installType} tar > /dev/null + ${installType} tar > /dev/null 2>&1 fi if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep cron` ]] @@ -372,15 +372,15 @@ installTools(){ echoContent green " ---> 安装crontabs" if [[ "${release}" = "ubuntu" ]] || [[ "${release}" = "debian" ]] then - ${installType} cron > /dev/null + ${installType} cron > /dev/null 2>&1 else - ${installType} crontabs > /dev/null + ${installType} crontabs > /dev/null 2>&1 fi fi if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep -w jq` ]] then echoContent green " ---> 安装jq" - ${installType} jq > /dev/null + ${installType} jq > /dev/null 2>&1 fi if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep binutils` ]] @@ -388,16 +388,23 @@ installTools(){ echoContent green " ---> 安装binutils" ${installType} binutils > /dev/null 2>&1 fi + + if [[ -z `find /bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep ping6` ]] + then + echoContent green " ---> 安装ping6" + ${installType} inetutils-ping > /dev/null 2>&1 + fi + if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep -w nginx` ]] then echoContent green " ---> 安装nginx" - ${installType} nginx > /dev/null + ${installType} nginx > /dev/null 2>&1 fi if [[ -z `find /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin |grep -v grep|grep -w sudo` ]] then echoContent green " ---> 安装sudo" - ${installType} sudo > /dev/null + ${installType} sudo > /dev/null 2>&1 fi # todo 关闭防火墙 @@ -504,7 +511,7 @@ EOF # 检查ip checkIP(){ - pingIP=`ping -4 -c 1 -W 1000 ${domain}|sed '1{s/[^(]*(//;s/).*//;q;}'` + pingIP=`ping -c 1 -W 1000 ${domain}|sed '1{s/[^(]*(//;s/).*//;q;}'` # ping -6 -c 1 -W 1000 ${domain}|sed '1{s/^([\da-fA-F]{1,4}:){7}[\da-fA-F]{1,4}$//;q;}' if [[ ! -z "${pingIP}" ]] && [[ `echo ${pingIP}|grep '^\([1-9]\|[1-9][0-9]\|1[0-9][0-9]\|2[0-4][0-9]\|25[0-5]\)\.\([0-9]\|[1-9][0-9]\|1[0-9][0-9]\|2[0-4][0-9]\|25[0-5]\)\.\([0-9]\|[1-9][0-9]\|1[0-9][0-9]\|2[0-4][0-9]\|25[0-5]\)\.\([0-9]\|[1-9][0-9]\|1[0-9][0-9]\|2[0-4][0-9]\|25[0-5]\)$'` ]] then @@ -561,6 +568,11 @@ installTLS(){ if [[ "${reInstallStatus}" = "y" ]] then rm -rf /etc/v2ray-agent/tls/* + if [[ "${tlsStatus}" = "已过期" ]] + then + rm -rf /root/.acme.sh/${domain}_ecc/* + fi + installTLS $1 fi fi @@ -2659,7 +2671,7 @@ aliasInstall(){ # 检查ipv6、ipv4 checkIPv6(){ - pingIPv6=`ping -6 -c 1 -W 1000 www.google.com|sed '2{s/[^(]*(//;s/).*//;q;}'|tail -n +2` + pingIPv6=`ping6 -c 1 -W 1000 www.google.com|sed '2{s/[^(]*(//;s/).*//;q;}'|tail -n +2` if [[ -z "${pingIPv6}" ]] then echoContent red " ---> 不支持ipv6" @@ -3013,7 +3025,7 @@ menu(){ cd echoContent red "\n==============================================================" echoContent green "作者：mack-a" - echoContent green "当前版本：v2.2.3" + echoContent green "当前版本：v2.2.4" echoContent green "Github：https://github.com/mack-a/v2ray-agent" echoContent green "描述：七合一共存脚本" echoContent red "=============================================================="