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 #170 from xiagw/remove-useless-version-number 

remove useless function version_number
pull/174/head
IceCodeNew 2020-10-15 23:34:56 +08:00 committed by GitHub
parent 7001a6d560 ab7cc47730
commit bfd16b9008
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
install-release.sh
View File

@ -205,29 +205,18 @@ install_software() {
fi fi
} }
version_number() {
case "$1" in
'v'*)
echo "$1"
;;
*)
echo "v$1"
;;
esac
}
get_version() { get_version() {
# 0: Install or update V2Ray. # 0: Install or update V2Ray.
# 1: Installed or no new version of V2Ray. # 1: Installed or no new version of V2Ray.
# 2: Install the specified version of V2Ray. # 2: Install the specified version of V2Ray.
if [[ -n "$VERSION" ]]; then if [[ -n "$VERSION" ]]; then
RELEASE_VERSION="$(version_number "$VERSION")" RELEASE_VERSION="v${VERSION#v}"
return 2 return 2
fi fi
# Determine the version number for V2Ray installed from a local file # Determine the version number for V2Ray installed from a local file
if [[ -f '/usr/local/bin/v2ray' ]]; then if [[ -f '/usr/local/bin/v2ray' ]]; then
VERSION="$(/usr/local/bin/v2ray -version)" VERSION="$(/usr/local/bin/v2ray -version | awk 'NR==1 {print $2}')"
CURRENT_VERSION="$(version_number "$(echo "$VERSION" | awk 'NR==1 {print $2}')")" CURRENT_VERSION="v${VERSION#v}"
if [[ "$LOCAL_INSTALL" -eq '1' ]]; then if [[ "$LOCAL_INSTALL" -eq '1' ]]; then
RELEASE_VERSION="$CURRENT_VERSION" RELEASE_VERSION="$CURRENT_VERSION"
return return
@ -242,7 +231,7 @@ get_version() {
fi fi
RELEASE_LATEST="$(sed 'y/,/\n/' "$TMP_FILE" | grep 'tag_name' | awk -F '"' '{print $4}')" RELEASE_LATEST="$(sed 'y/,/\n/' "$TMP_FILE" | grep 'tag_name' | awk -F '"' '{print $4}')"
"rm" "$TMP_FILE" "rm" "$TMP_FILE"
RELEASE_VERSION="$(version_number "$RELEASE_LATEST")" RELEASE_VERSION="v${RELEASE_LATEST#v}"
# Compare V2Ray version numbers # Compare V2Ray version numbers
if [[ "$RELEASE_VERSION" != "$CURRENT_VERSION" ]]; then if [[ "$RELEASE_VERSION" != "$CURRENT_VERSION" ]]; then
RELEASE_VERSIONSION_NUMBER="${RELEASE_VERSION#v}" RELEASE_VERSIONSION_NUMBER="${RELEASE_VERSION#v}"