github
/
fhs-install-v2ray
mirror of https://github.com/v2fly/fhs-install-v2ray
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #141 from v2fly/develop

pull/148/head
IceCodeNew 2020-09-25 16:00:01 +08:00 committed by GitHub
parent 8182973f3f 3540fe109c
commit 4d3eac3ff3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
install-release.sh
View File

@ -28,7 +28,7 @@ green=$(tput setaf 2)
reset=$(tput sgr0) reset=$(tput sgr0)
curl() { curl() {
$(type -P curl) -L -q --retry 5 --retry-delay 10 --retry-max-time 60 "$@" $(type -P curl) -L -q --retry 5 --retry-delay 10 --retry-max-time 60 "$@"
} }
check_if_running_as_root() { check_if_running_as_root() {
@ -93,25 +93,32 @@ identify_the_operating_system_and_architecture() {
echo "error: Don't use outdated Linux distributions." echo "error: Don't use outdated Linux distributions."
exit 1 exit 1
fi fi
if [[ -z "$(ls -l /sbin/init | grep systemd)" ]]; then # Do not combine this judgment condition with the following judgment condition.
## Be aware of Linux distribution like Gentoo, which kernel supports switch between Systemd and OpenRC.
### Refer: https://github.com/v2fly/fhs-install-v2ray/issues/84#issuecomment-688574989
if [[ -f /.dockerenv ]] || grep -q 'docker\|lxc' /proc/1/cgroup && [[ "$(type -P systemctl)" ]]; then
true
elif [[ -d /run/systemd/system ]] || grep -q systemd <(ls -l /sbin/init); then
true
else
echo "error: Only Linux distributions using systemd are supported." echo "error: Only Linux distributions using systemd are supported."
exit 1 exit 1
fi fi
if [[ "$(type -P apt)" ]]; then if [[ "$(type -P apt)" ]]; then
PACKAGE_MANAGEMENT_INSTALL='apt install -y --no-install-recommends' PACKAGE_MANAGEMENT_INSTALL='apt install -y --no-install-recommends'
PACKAGE_MANAGEMENT_REMOVE='apt purge' PACKAGE_MANAGEMENT_REMOVE='apt purge -y --auto-remove'
elif [[ "$(type -P dnf)" ]]; then elif [[ "$(type -P dnf)" ]]; then
PACKAGE_MANAGEMENT_INSTALL='dnf install -y' PACKAGE_MANAGEMENT_INSTALL='dnf install -y'
PACKAGE_MANAGEMENT_REMOVE='dnf remove' PACKAGE_MANAGEMENT_REMOVE='dnf remove -y'
elif [[ "$(type -P yum)" ]]; then elif [[ "$(type -P yum)" ]]; then
PACKAGE_MANAGEMENT_INSTALL='yum install -y' PACKAGE_MANAGEMENT_INSTALL='yum install -y'
PACKAGE_MANAGEMENT_REMOVE='yum remove' PACKAGE_MANAGEMENT_REMOVE='yum remove -y'
elif [[ "$(type -P zypper)" ]]; then elif [[ "$(type -P zypper)" ]]; then
PACKAGE_MANAGEMENT_INSTALL='zypper install -y' PACKAGE_MANAGEMENT_INSTALL='zypper install -y --no-recommends'
PACKAGE_MANAGEMENT_REMOVE='zypper remove' PACKAGE_MANAGEMENT_REMOVE='zypper remove -yu'
elif [[ "$(type -P pacman)" ]]; then elif [[ "$(type -P pacman)" ]]; then
PACKAGE_MANAGEMENT_INSTALL='pacman -S --noconfirm' PACKAGE_MANAGEMENT_INSTALL='pacman -Syu --noconfirm'
PACKAGE_MANAGEMENT_REMOVE='pacman -R' PACKAGE_MANAGEMENT_REMOVE='pacman -Rsun --noconfirm'
else else
echo "error: The script does not support the package manager in this operating system." echo "error: The script does not support the package manager in this operating system."
exit 1 exit 1
@ -173,7 +180,7 @@ judgment_parameters() {
install_software() { install_software() {
COMPONENT="$1" COMPONENT="$1"
command -v "$COMPONENT" > /dev/null 2>&1 && return type -P "$COMPONENT" > /dev/null 2>&1 && return
if ${PACKAGE_MANAGEMENT_INSTALL} "$COMPONENT"; then if ${PACKAGE_MANAGEMENT_INSTALL} "$COMPONENT"; then
echo "info: $COMPONENT is installed." echo "info: $COMPONENT is installed."
else else
@ -212,7 +219,6 @@ get_version() {
fi fi
# Get V2Ray release version number # Get V2Ray release version number
TMP_FILE="$(mktemp)" TMP_FILE="$(mktemp)"
install_software curl
# DO NOT QUOTE THESE `${PROXY}` VARIABLES! # DO NOT QUOTE THESE `${PROXY}` VARIABLES!
if ! curl ${PROXY} -sS -H "Accept: application/vnd.github.v3+json" -o "$TMP_FILE" 'https://api.github.com/repos/v2fly/v2ray-core/releases/latest'; then if ! curl ${PROXY} -sS -H "Accept: application/vnd.github.v3+json" -o "$TMP_FILE" 'https://api.github.com/repos/v2fly/v2ray-core/releases/latest'; then
"rm" "$TMP_FILE" "rm" "$TMP_FILE"
@ -495,6 +501,7 @@ main() {
decompression "$LOCAL_FILE" decompression "$LOCAL_FILE"
else else
# Normal way # Normal way
install_software curl
get_version get_version
NUMBER="$?" NUMBER="$?"
if [[ "$NUMBER" -eq '0' ]] || [[ "$FORCE" -eq '1' ]] || [[ "$NUMBER" -eq 2 ]]; then if [[ "$NUMBER" -eq '0' ]] || [[ "$FORCE" -eq '1' ]] || [[ "$NUMBER" -eq 2 ]]; then