mirror of
https://github.com/v2fly/v2ray-core.git
synced 2024-09-29 23:36:25 -04:00
Merge branch 'master' of https://github.com/v2ray/v2ray-core
This commit is contained in:
commit
867135d85a
@ -197,7 +197,7 @@ getVersion(){
|
|||||||
else
|
else
|
||||||
VER=`/usr/bin/v2ray/v2ray -version 2>/dev/null`
|
VER=`/usr/bin/v2ray/v2ray -version 2>/dev/null`
|
||||||
RETVAL="$?"
|
RETVAL="$?"
|
||||||
CUR_VER=`echo $VER | head -n 1 | cut -d " " -f2 | cut -d. -f-2`
|
CUR_VER=`echo $VER | head -n 1 | cut -d " " -f2`
|
||||||
if [[ ${CUR_VER} != v* ]]; then
|
if [[ ${CUR_VER} != v* ]]; then
|
||||||
CUR_VER=v${CUR_VER}
|
CUR_VER=v${CUR_VER}
|
||||||
fi
|
fi
|
||||||
@ -211,7 +211,7 @@ getVersion(){
|
|||||||
return 3
|
return 3
|
||||||
elif [[ $RETVAL -ne 0 ]];then
|
elif [[ $RETVAL -ne 0 ]];then
|
||||||
return 2
|
return 2
|
||||||
elif [[ "$NEW_VER" != "$CUR_VER" ]];then
|
elif [[ `echo $NEW_VER | cut -d. -f-2` != `echo $CUR_VER | cut -d. -f-2` ]];then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
return 0
|
return 0
|
||||||
|
Loading…
Reference in New Issue
Block a user