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

Correct the output

pull/1/head
Dct Mei 2020-04-12 11:57:44 +08:00
parent 6effa0a0da
commit f30b149b6d
No known key found for this signature in database
GPG Key ID: 50BF8B712DCAD7EA
1 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
install-release.sh
View File

@ -88,7 +88,7 @@ if [[ "$#" -gt '0' ]]; then
case "$1" in case "$1" in
'--remove') '--remove')
if [[ "$#" -gt '1' ]]; then if [[ "$#" -gt '1' ]]; then
echo 'error: Please enter the correct command.' echo 'error: Please enter the correct parameters.'
exit 1 exit 1
fi fi
REMOVE='1' REMOVE='1'
@ -102,21 +102,21 @@ if [[ "$#" -gt '0' ]]; then
;; ;;
'-c' | '--check') '-c' | '--check')
if [[ "$#" -gt '1' ]]; then if [[ "$#" -gt '1' ]]; then
echo 'error: Please enter the correct command.' echo 'error: Please enter the correct parameters.'
exit 1 exit 1
fi fi
CHECK='1' CHECK='1'
;; ;;
'-f' | '--force') '-f' | '--force')
if [[ "$#" -gt '1' ]]; then if [[ "$#" -gt '1' ]]; then
echo 'error: Please enter the correct command.' echo 'error: Please enter the correct parameters.'
exit 1 exit 1
fi fi
FORCE='1' FORCE='1'
;; ;;
'-h' | '--help') '-h' | '--help')
if [[ "$#" -gt '1' ]]; then if [[ "$#" -gt '1' ]]; then
echo 'error: Please enter the correct command.' echo 'error: Please enter the correct parameters.'
exit 1 exit 1
fi fi
HELP='1' HELP='1'
@ -149,43 +149,42 @@ if [[ "$#" -gt '0' ]]; then
;; ;;
esac esac
PROXY="-x $2" PROXY="-x $2"
# Parameters available through a proxy server
# Parameters available through a proxy server if [[ "$#" -gt '2' ]]; then
if [[ "$#" -gt '2' ]]; then case "$3" in
case "$3" in '--version')
'--version') if [[ "$#" -gt '4' ]] || [[ -z "$4" ]]; then
if [[ "$#" -gt '4' ]] || [[ -z "$4" ]]; then echo 'error: Please specify the correct version.'
echo 'error: Please specify the correct version.'
exit 1
fi
VERSION="$2"
;;
'-c' | '--check')
if [[ "$#" -gt '3' ]]; then
echo 'error: Please enter the correct command.'
exit 1
fi
CHECK='1'
;;
'-f' | '--force')
if [[ "$#" -gt '3' ]]; then
echo 'error: Please enter the correct command.'
exit 1
fi
FORCE='1'
;;
*)
echo "$0: unknown option -- -"
exit 1 exit 1
;; fi
esac VERSION="$2"
fi ;;
;; '-c' | '--check')
*) if [[ "$#" -gt '3' ]]; then
echo "$0: unknown option -- -" echo 'error: Please enter the correct parameters.'
exit 1 exit 1
;; fi
esac CHECK='1'
;;
'-f' | '--force')
if [[ "$#" -gt '3' ]]; then
echo 'error: Please enter the correct parameters.'
exit 1
fi
FORCE='1'
;;
*)
echo "$0: unknown option -- -"
exit 1
;;
esac
fi
;;
*)
echo "$0: unknown option -- -"
exit 1
;;
esac
fi fi
install_software() { install_software() {
@ -226,7 +225,6 @@ get_version() {
return return
fi fi
fi fi
# Get V2Ray release version number # Get V2Ray release version number
TMP_FILE="$(mktemp)" TMP_FILE="$(mktemp)"
install_software curl install_software curl
@ -239,7 +237,6 @@ get_version() {
RELEASE_LATEST="$(cat $TMP_FILE | sed 'y/,/\n/' | grep 'tag_name' | awk -F '"' '{print $4}')" RELEASE_LATEST="$(cat $TMP_FILE | sed 'y/,/\n/' | grep 'tag_name' | awk -F '"' '{print $4}')"
rm "$TMP_FILE" rm "$TMP_FILE"
RELEASE_VERSION="$(version_number $RELEASE_LATEST)" RELEASE_VERSION="$(version_number $RELEASE_LATEST)"
# 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}"