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

fix(脚本): 修复由于debian改名，引起的无法正常安装工具的问题

pull/534/merge
mack-a 2021-09-09 10:48:28 +08:00
parent 42e5b758d8
commit d3e960f270
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
install.sh
View File

@ -53,12 +53,14 @@ checkSystem() {
release="debian" release="debian"
installType='apt -y install' installType='apt -y install'
upgrade="apt update" upgrade="apt update"
updateReleaseInfoChange='apt-get --allow-releaseinfo-change update'
removeType='apt -y autoremove' removeType='apt -y autoremove'
elif grep </etc/issue -q -i "ubuntu" && [[ -f "/etc/issue" ]] || grep </etc/issue -q -i "ubuntu" && [[ -f "/proc/version" ]]; then elif grep </etc/issue -q -i "ubuntu" && [[ -f "/etc/issue" ]] || grep </etc/issue -q -i "ubuntu" && [[ -f "/proc/version" ]]; then
release="ubuntu" release="ubuntu"
installType='apt -y install' installType='apt -y install'
upgrade="apt update" upgrade="apt update"
updateReleaseInfoChange='apt-get --allow-releaseinfo-change update'
removeType='apt -y autoremove' removeType='apt -y autoremove'
if grep </etc/issue -q -i "16."; then if grep </etc/issue -q -i "16."; then
release= release=
@ -408,7 +410,11 @@ installTools() {
echoContent green " ---> 检查、安装更新【新机器会很慢，如长时间无反应，请手动停止后重新执行】" echoContent green " ---> 检查、安装更新【新机器会很慢，如长时间无反应，请手动停止后重新执行】"
${upgrade} >/dev/null 2>&1 ${upgrade} >/etc/v2ray-agent/install.log 2>&1
if grep <"/etc/v2ray-agent/install.log" -q "changed"; then
${updateReleaseInfoChange} >/dev/null 2>&1
fi
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 ${installType} epel-release >/dev/null 2>&1
@ -4122,7 +4128,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.5.32" echoContent green "当前版本：v2.5.33"
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