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

update error messages in install release script.

pull/1162/merge
Darien Raymond 2018-06-23 00:08:40 +02:00
parent ef4542e778
commit 55897f0b22
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
release/install-release.sh
View File

@ -131,7 +131,7 @@ installSoftware(){
colorEcho ${BLUE} "Installing ${COMPONENT}" colorEcho ${BLUE} "Installing ${COMPONENT}"
$CMD_INSTALL $COMPONENT $CMD_INSTALL $COMPONENT
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
colorEcho ${RED} "Install ${COMPONENT} fail, please install it manually." colorEcho ${RED} "Failed to install ${COMPONENT}. Please install it manually."
return 1 return 1
fi fi
return 0 return 0
@ -160,7 +160,7 @@ extract(){
mkdir -p /tmp/v2ray mkdir -p /tmp/v2ray
unzip $1 -d "/tmp/v2ray/" unzip $1 -d "/tmp/v2ray/"
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
colorEcho ${RED} "Extracting V2Ray failed!" colorEcho ${RED} "Failed to extract V2Ray."
return 2 return 2
fi fi
return 0 return 0
@ -179,7 +179,7 @@ getVersion(){
TAG_URL="https://api.github.com/repos/v2ray/v2ray-core/releases/latest" TAG_URL="https://api.github.com/repos/v2ray/v2ray-core/releases/latest"
NEW_VER=`curl ${PROXY} -s ${TAG_URL} --connect-timeout 10| grep 'tag_name' | cut -d\" -f4` NEW_VER=`curl ${PROXY} -s ${TAG_URL} --connect-timeout 10| grep 'tag_name' | cut -d\" -f4`
if [[ $? -ne 0 ]] || [[ $NEW_VER == "" ]]; then if [[ $? -ne 0 ]] || [[ $NEW_VER == "" ]]; then
colorEcho ${RED} "Network error! Please check your network or try again." colorEcho ${RED} "Failed to fetch release information. Please check your network or try again."
return 3 return 3
elif [[ $RETVAL -ne 0 ]];then elif [[ $RETVAL -ne 0 ]];then
return 2 return 2
@ -238,7 +238,7 @@ installV2Ray(){
mkdir -p /usr/bin/v2ray mkdir -p /usr/bin/v2ray
copyFile v2ray copyFile v2ray
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
colorEcho ${RED} "Copy V2Ray binary failed." colorEcho ${RED} "Failed to copy V2Ray binary and resources."
return 1 return 1
fi fi
makeExecutable v2ray makeExecutable v2ray
@ -252,7 +252,7 @@ installV2Ray(){
mkdir -p /var/log/v2ray mkdir -p /var/log/v2ray
cp "/tmp/v2ray/v2ray-${NEW_VER}-linux-${VDIS}/vpoint_vmess_freedom.json" "/etc/v2ray/config.json" cp "/tmp/v2ray/v2ray-${NEW_VER}-linux-${VDIS}/vpoint_vmess_freedom.json" "/etc/v2ray/config.json"
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
colorEcho ${YELLOW} "Create V2Ray configuration file error, pleases create it manually." colorEcho ${YELLOW} "Failed to create V2Ray configuration file. Please create it manually."
return 1 return 1
fi fi
let PORT=$RANDOM+10000 let PORT=$RANDOM+10000
@ -371,7 +371,7 @@ main(){
sysArch sysArch
# extract local file # extract local file
if [[ $LOCAL_INSTALL -eq 1 ]]; then if [[ $LOCAL_INSTALL -eq 1 ]]; then
echo "Install V2Ray via local file" echo "Installing V2Ray via local file"
installSoftware unzip || return $? installSoftware unzip || return $?
rm -rf /tmp/v2ray rm -rf /tmp/v2ray
extract $LOCAL || return $? extract $LOCAL || return $?