From 4ad3cf0c211a7c72390701cc5ab4a900ac841b21 Mon Sep 17 00:00:00 2001
From: mack-a <57424792+mack-a@users.noreply.github.com>
Date: Mon, 1 Mar 2021 14:52:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=84=9A=E6=9C=AC):=20=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=9B=B4=E6=96=B0=E5=90=8E=E6=97=A0=E6=B3=95?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=B0=E7=89=88=E6=9C=AC=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
documents/common_commands.md | 58 ------------------------------------
documents/shell_error.md | 35 ----------------------
install.sh | 6 +++-
3 files changed, 5 insertions(+), 94 deletions(-)
delete mode 100644 documents/common_commands.md
delete mode 100644 documents/shell_error.md
diff --git a/documents/common_commands.md b/documents/common_commands.md
deleted file mode 100644
index 4882769..0000000
--- a/documents/common_commands.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# 启动脚本
-```
-vasma
-```
-
-# 服务管理
-## Xray-core、v2ray-core、trojan-go
-- 重启
-```
-# xray
-systemctl restart xray
-
-# v2ray
-systemctl restart v2ray
-
-# trojan-go
-systemctl restart trojan-go
-```
-
-- 启动
-````
-# xray
-systemctl start xray
-
-# v2ray
-systemctl start v2ray
-
-# trojan-go
-systemctl start trojan-go
-````
-
-- 关闭
-```
-# xray
-systemctl stop xray
-
-# v2ray
-systemctl stop v2ray
-
-# trojan-go
-systemctl stop trojan-go
-```
-
-## nginx
-- 重启
-```
-nginx -s reload
-```
-
-- 启动
-````
-nginx
-````
-
-- 关闭
-```
-nginx -s stop
-```
\ No newline at end of file
diff --git a/documents/shell_error.md b/documents/shell_error.md
deleted file mode 100644
index 3aef400..0000000
--- a/documents/shell_error.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# 脚本常见错误处理
-## 1.输入域名后卡住
-```
-# 请手动打开icmp
-```
-
-## 2.下载脚本失败
-
-
-- 需要手动更改dns
-```
-# 文件位置
-/etc/resolv.conf
-
-# 文件内容
-nameserver 8.8.8.8
-nameserver 1.1.1.1
-nameserver 8.8.4.4
-```
-
-## 3.生成证书失败
-- 请更换Debian或者Ubuntu
-
-
-
-## 4.Debian8启动nginx失败
-### 解决方法一
-- 手动删除add_header选项
-```
-vim /etc/nginx/conf.d/alone.conf
-# 删除下方代码
-location / {
- add_header Strict-Transport-Security "max-age=63072000" always;
-}
-```
\ No newline at end of file
diff --git a/install.sh b/install.sh
index 4fae9e5..31f928a 100644
--- a/install.sh
+++ b/install.sh
@@ -2559,6 +2559,7 @@ removeUser() {
# 更新脚本
updateV2RayAgent() {
echoContent skyBlue "\n进度 $1/${totalProgress} : 更新v2ray-agent脚本"
+ rm -rf /etc/v2ray-agent/install.sh
if wget --help | grep -q show-progress; then
wget -c -q --show-progress -P /etc/v2ray-agent/ -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/install.sh"
else
@@ -2571,6 +2572,9 @@ updateV2RayAgent() {
echoContent green "\n ---> 更新完毕"
echoContent yellow " ---> 请手动执行[vasma]打开脚本"
echoContent green " ---> 当前版本:${version}\n"
+ echoContent yellow "如更新不成功，请手动执行下面命令\n"
+ echoContent skyBlue "wget -P /root -N --no-check-certificate "https://raw.githubusercontent.com/mack-a/v2ray-agent/master/install.sh" && chmod 700 /root/install.sh && /root/install.sh"
+ echo
exit 0
}
@@ -3245,7 +3249,7 @@ menu() {
cd "$HOME" || exit
echoContent red "\n=============================================================="
echoContent green "作者：mack-a"
- echoContent green "当前版本：v2.3.21"
+ echoContent green "当前版本：v2.3.22"
echoContent green "Github：https://github.com/mack-a/v2ray-agent"
echoContent green "描述：七合一共存脚本"
echoContent red "=============================================================="