Merge pull request #36 from v2fly/develop

fix: issue #33
pull/64/head
Dct Mei 2020-08-08 08:23:19 +00:00 committed by GitHub
commit 20150257b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 10 deletions

View File

@ -29,14 +29,23 @@ identify_the_operating_system_and_architecture() {
'amd64' | 'x86_64') 'amd64' | 'x86_64')
MACHINE='64' MACHINE='64'
;; ;;
'armv6l' | 'armv7' | 'armv7l' ) 'armv5tel')
MACHINE='arm' MACHINE='arm32-v5'
;;
'armv6l')
MACHINE='arm32-v6'
;;
'armv7' | 'armv7l' )
MACHINE='arm32-v7a'
;; ;;
'armv8' | 'aarch64') 'armv8' | 'aarch64')
MACHINE='arm64' MACHINE='arm64-v8a'
;; ;;
'mips') 'mips')
MACHINE='mips' MACHINE='mips32'
;;
'mipsle')
MACHINE='mips32le'
;; ;;
'mips64') 'mips64')
MACHINE='mips64' MACHINE='mips64'
@ -44,18 +53,18 @@ identify_the_operating_system_and_architecture() {
'mips64le') 'mips64le')
MACHINE='mips64le' MACHINE='mips64le'
;; ;;
'mipsle')
MACHINE='mipsle'
;;
's390x')
MACHINE='s390x'
;;
'ppc64') 'ppc64')
MACHINE='ppc64' MACHINE='ppc64'
;; ;;
'ppc64le') 'ppc64le')
MACHINE='ppc64le' MACHINE='ppc64le'
;; ;;
'riscv64')
MACHINE='riscv64'
;;
's390x')
MACHINE='s390x'
;;
*) *)
echo "error: The architecture is not supported." echo "error: The architecture is not supported."
exit 1 exit 1
@ -238,6 +247,7 @@ get_version() {
# Get V2Ray release version number # Get V2Ray release version number
TMP_FILE="$(mktemp)" TMP_FILE="$(mktemp)"
install_software curl install_software curl
# DO NOT QUOTE THESE `${PROXY}` VARIABLES!
if ! curl ${PROXY} -s -o "$TMP_FILE" 'https://api.github.com/repos/v2fly/v2ray-core/releases/latest'; then if ! curl ${PROXY} -s -o "$TMP_FILE" 'https://api.github.com/repos/v2fly/v2ray-core/releases/latest'; then
rm "$TMP_FILE" rm "$TMP_FILE"
echo 'error: Failed to get release list, please check your network.' echo 'error: Failed to get release list, please check your network.'