mirror of
https://github.com/remittor/zapret-openwrt.git
synced 2025-12-31 11:56:02 +03:00
updater: Adapt code for new version format
This commit is contained in:
@@ -104,7 +104,8 @@ function normalize_version
|
|||||||
{
|
{
|
||||||
local ver="$1"
|
local ver="$1"
|
||||||
local base
|
local base
|
||||||
local major minor rel
|
local major minor build rel
|
||||||
|
local old_ifs
|
||||||
case "$ver" in
|
case "$ver" in
|
||||||
*-r[0-9]*)
|
*-r[0-9]*)
|
||||||
rel="${ver##*-r}"
|
rel="${ver##*-r}"
|
||||||
@@ -115,11 +116,12 @@ function normalize_version
|
|||||||
base="$ver"
|
base="$ver"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
major="${base%%.*}"
|
old_ifs="$IFS" ; IFS='.' ; set -- $base ; IFS="$old_ifs"
|
||||||
minor="${base#*.}"
|
major=${1:-0}
|
||||||
[ -z "$minor" ] && minor=0
|
minor=${2:-0}
|
||||||
[ -z "$rel" ] && rel=1
|
build=${3:-0}
|
||||||
echo "$major.$minor.$rel"
|
rel=${rel:-1}
|
||||||
|
echo "$major.$minor.$build.$rel"
|
||||||
}
|
}
|
||||||
|
|
||||||
function pkg_version_cmp
|
function pkg_version_cmp
|
||||||
@@ -137,11 +139,16 @@ function pkg_version_cmp
|
|||||||
x2=$( echo "$ver2" | cut -d. -f2 )
|
x2=$( echo "$ver2" | cut -d. -f2 )
|
||||||
[ "$x1" -gt "$x2" ] && { echo -n "G"; return 0; }
|
[ "$x1" -gt "$x2" ] && { echo -n "G"; return 0; }
|
||||||
[ "$x1" -lt "$x2" ] && { echo -n "L"; return 0; }
|
[ "$x1" -lt "$x2" ] && { echo -n "L"; return 0; }
|
||||||
# release
|
# build
|
||||||
x1=$( echo "$ver1" | cut -d. -f3 )
|
x1=$( echo "$ver1" | cut -d. -f3 )
|
||||||
x2=$( echo "$ver2" | cut -d. -f3 )
|
x2=$( echo "$ver2" | cut -d. -f3 )
|
||||||
[ "$x1" -gt "$x2" ] && { echo -n "G"; return 0; }
|
[ "$x1" -gt "$x2" ] && { echo -n "G"; return 0; }
|
||||||
[ "$x1" -lt "$x2" ] && { echo -n "L"; return 0; }
|
[ "$x1" -lt "$x2" ] && { echo -n "L"; return 0; }
|
||||||
|
# release
|
||||||
|
x1=$( echo "$ver1" | cut -d. -f4 )
|
||||||
|
x2=$( echo "$ver2" | cut -d. -f4 )
|
||||||
|
[ "$x1" -gt "$x2" ] && { echo -n "G"; return 0; }
|
||||||
|
[ "$x1" -lt "$x2" ] && { echo -n "L"; return 0; }
|
||||||
echo -n "E"
|
echo -n "E"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user