github
/
v2ray-agent
mirror of https://github.com/mack-a/v2ray-agent
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(脚本): 更新示例图、修改DD centos7.9后无法安装jq导致的解析错误问题

pull/534/merge
mack-a 2021-05-19 16:10:23 +08:00
parent b2df8c3e44
commit 1e47d84c4a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
fodder/install/install.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 972 KiB

After

Width:  |  Height:  |  Size: 990 KiB

5
install.sh
View File

@ -356,6 +356,7 @@ installTools() {
${upgrade} >/dev/null 2>&1 ${upgrade} >/dev/null 2>&1
if [[ "${release}" == "centos" ]]; then if [[ "${release}" == "centos" ]]; then
rm -rf /var/run/yum.pid rm -rf /var/run/yum.pid
${installType} epel-release >/dev/null 2>&1
fi fi
# [[ -z `find /usr/bin /usr/sbin |grep -v grep|grep -w curl` ]] # [[ -z `find /usr/bin /usr/sbin |grep -v grep|grep -w curl` ]]
@ -424,7 +425,7 @@ installTools() {
if [[ ${nginxVersion} -lt 14 ]]; then if [[ ${nginxVersion} -lt 14 ]]; then
read -r -p "读取到当前的Nginx版本不支持gRPC，会导致安装失败，是否卸载Nginx后重新安装 ？[y/n]:" unInstallNginxStatus read -r -p "读取到当前的Nginx版本不支持gRPC，会导致安装失败，是否卸载Nginx后重新安装 ？[y/n]:" unInstallNginxStatus
if [[ "${unInstallNginxStatus}" == "y" ]]; then if [[ "${unInstallNginxStatus}" == "y" ]]; then
${removeType} nginx #>/dev/null 2>&1 ${removeType} nginx >/dev/null 2>&1
echoContent yellow " ---> nginx卸载完成" echoContent yellow " ---> nginx卸载完成"
echoContent green " ---> 安装nginx" echoContent green " ---> 安装nginx"
installNginxTools >/dev/null 2>&1 installNginxTools >/dev/null 2>&1
@ -3772,7 +3773,7 @@ menu() {
cd "$HOME" || exit cd "$HOME" || exit
echoContent red "\n==============================================================" echoContent red "\n=============================================================="
echoContent green "作者：mack-a" echoContent green "作者：mack-a"
echoContent green "当前版本：v2.4.24" echoContent green "当前版本：v2.4.25"
echoContent green "Github：https://github.com/mack-a/v2ray-agent" echoContent green "Github：https://github.com/mack-a/v2ray-agent"
echoContent green "描述：八合一共存脚本\c" echoContent green "描述：八合一共存脚本\c"
showInstallStatus showInstallStatus