diff --git a/release/install-release.sh b/release/install-release.sh index 813b4b33b..1c317d125 100755 --- a/release/install-release.sh +++ b/release/install-release.sh @@ -205,14 +205,12 @@ startV2ray(){ copyFile() { NAME=$1 - MANDATE=$2 ERROR=`cp "/tmp/v2ray/v2ray-${NEW_VER}-linux-${VDIS}/${NAME}" "/usr/bin/v2ray/${NAME}" 2>&1` if [[ $? -ne 0 ]]; then colorEcho ${YELLOW} "${ERROR}" - if [ "$MANDATE" = true ]; then - exit - fi + return 2 fi + return 0 } makeExecutable() { @@ -222,12 +220,12 @@ makeExecutable() { installV2Ray(){ # Install V2Ray binary to /usr/bin/v2ray mkdir -p /usr/bin/v2ray - copyFile v2ray true + copyFile v2ray || return $? makeExecutable v2ray - copyFile v2ctl false + copyFile v2ctl makeExecutable v2ctl - copyFile geoip.dat false - copyFile geosite.dat false + copyFile geoip.dat + copyFile geosite.dat # Install V2Ray server config to /etc/v2ray if [[ ! -f "/etc/v2ray/config.json" ]]; then @@ -388,7 +386,7 @@ main(){ V2RAY_RUNNING=1 stopV2ray fi - installV2Ray + installV2Ray || return $? installInitScript if [[ ${V2RAY_RUNNING} -eq 1 ]];then colorEcho ${BLUE} "Restarting V2Ray service."