mirror of https://github.com/mack-a/v2ray-agent
Merge pull request #1176 from OiAnthony/fix_alpine_check_system
Fix alpine check systempull/1181/head
commit
30c47bf110
17
install.sh
17
install.sh
|
@ -58,6 +58,12 @@ checkSystem() {
|
||||||
removeType='yum -y remove'
|
removeType='yum -y remove'
|
||||||
upgrade="yum update -y --skip-broken"
|
upgrade="yum update -y --skip-broken"
|
||||||
checkCentosSELinux
|
checkCentosSELinux
|
||||||
|
elif { [[ -f "/etc/issue" ]] && grep -qi "Alpine" /etc/issue; } || { [[ -f "/proc/version" ]] && grep -qi "Alpine" /proc/version; }; then
|
||||||
|
release="alpine"
|
||||||
|
installType='apk add'
|
||||||
|
upgrade="apk update"
|
||||||
|
removeType='apk del'
|
||||||
|
nginxConfigPath=/etc/nginx/http.d/
|
||||||
elif { [[ -f "/etc/issue" ]] && grep -qi "debian" /etc/issue; } || { [[ -f "/proc/version" ]] && grep -qi "debian" /proc/version; } || { [[ -f "/etc/os-release" ]] && grep -qi "ID=debian" /etc/issue; }; then
|
elif { [[ -f "/etc/issue" ]] && grep -qi "debian" /etc/issue; } || { [[ -f "/proc/version" ]] && grep -qi "debian" /proc/version; } || { [[ -f "/etc/os-release" ]] && grep -qi "ID=debian" /etc/issue; }; then
|
||||||
release="debian"
|
release="debian"
|
||||||
installType='apt -y install'
|
installType='apt -y install'
|
||||||
|
@ -74,12 +80,6 @@ checkSystem() {
|
||||||
if grep </etc/issue -q -i "16."; then
|
if grep </etc/issue -q -i "16."; then
|
||||||
release=
|
release=
|
||||||
fi
|
fi
|
||||||
elif { [[ -f "/etc/issue" ]] && grep -qi "Alpine" /etc/issue; } || { [[ -f "/proc/version" ]] && grep -qi "Alpine" /proc/version; }; then
|
|
||||||
release="alpine"
|
|
||||||
installType='apk add'
|
|
||||||
upgrade="apk update"
|
|
||||||
removeType='apk del'
|
|
||||||
nginxConfigPath=/etc/nginx/http.d/
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z ${release} ]]; then
|
if [[ -z ${release} ]]; then
|
||||||
|
@ -1108,6 +1108,11 @@ installTools() {
|
||||||
${installType} binutils >/dev/null 2>&1
|
${installType} binutils >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if ! find /usr/bin /usr/sbin | grep -q -w openssl; then
|
||||||
|
echoContent green " ---> 安装openssl"
|
||||||
|
${installType} openssl >/dev/null 2>&1
|
||||||
|
fi
|
||||||
|
|
||||||
if ! find /usr/bin /usr/sbin | grep -q -w ping6; then
|
if ! find /usr/bin /usr/sbin | grep -q -w ping6; then
|
||||||
echoContent green " ---> 安装ping6"
|
echoContent green " ---> 安装ping6"
|
||||||
${installType} inetutils-ping >/dev/null 2>&1
|
${installType} inetutils-ping >/dev/null 2>&1
|
||||||
|
|
Loading…
Reference in New Issue