mirror of
https://github.com/deajan/obackup.git
synced 2024-12-25 15:03:41 +01:00
Update ofunctions
This commit is contained in:
parent
644346316c
commit
64c32bca07
@ -3,7 +3,7 @@
|
|||||||
#### OFUNCTIONS MINI SUBSET ####
|
#### OFUNCTIONS MINI SUBSET ####
|
||||||
|
|
||||||
_OFUNCTIONS_VERSION=2.1.1
|
_OFUNCTIONS_VERSION=2.1.1
|
||||||
_OFUNCTIONS_BUILD=2017041001
|
_OFUNCTIONS_BUILD=2017041101
|
||||||
#### _OFUNCTIONS_BOOTSTRAP SUBSET ####
|
#### _OFUNCTIONS_BOOTSTRAP SUBSET ####
|
||||||
_OFUNCTIONS_BOOTSTRAP=true
|
_OFUNCTIONS_BOOTSTRAP=true
|
||||||
#### _OFUNCTIONS_BOOTSTRAP SUBSET END ####
|
#### _OFUNCTIONS_BOOTSTRAP SUBSET END ####
|
||||||
@ -1833,38 +1833,42 @@ function ParentPid {
|
|||||||
# Neat version compare function found at http://stackoverflow.com/a/4025065/2635443
|
# Neat version compare function found at http://stackoverflow.com/a/4025065/2635443
|
||||||
# Returns 0 if equal, 1 if $1 > $2 and 2 if $1 < $2
|
# Returns 0 if equal, 1 if $1 > $2 and 2 if $1 < $2
|
||||||
function VerComp () {
|
function VerComp () {
|
||||||
local result
|
if [ "$1" == "" ] || [ "$2" == "" ]; then
|
||||||
|
Logger "Bogus Vercomp values [$1] and [$2]." "WARN"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ $1 == $2 ]]
|
if [[ $1 == $2 ]]
|
||||||
then
|
then
|
||||||
echo 0
|
echo 0
|
||||||
return
|
|
||||||
fi
|
|
||||||
local IFS=.
|
|
||||||
local i ver1=($1) ver2=($2)
|
|
||||||
# fill empty fields in ver1 with zeros
|
|
||||||
for ((i=${#ver1[@]}; i<${#ver2[@]}; i++))
|
|
||||||
do
|
|
||||||
ver1[i]=0
|
|
||||||
done
|
|
||||||
for ((i=0; i<${#ver1[@]}; i++))
|
|
||||||
do
|
|
||||||
if [[ -z ${ver2[i]} ]]
|
|
||||||
then
|
|
||||||
# fill empty fields in ver2 with zeros
|
|
||||||
ver2[i]=0
|
|
||||||
fi
|
|
||||||
if ((10#${ver1[i]} > 10#${ver2[i]}))
|
|
||||||
then
|
|
||||||
echo 1
|
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
if ((10#${ver1[i]} < 10#${ver2[i]}))
|
|
||||||
then
|
local IFS=.
|
||||||
echo 2
|
local i ver1=($1) ver2=($2)
|
||||||
return
|
# fill empty fields in ver1 with zeros
|
||||||
fi
|
for ((i=${#ver1[@]}; i<${#ver2[@]}; i++))
|
||||||
done
|
do
|
||||||
|
ver1[i]=0
|
||||||
|
done
|
||||||
|
for ((i=0; i<${#ver1[@]}; i++))
|
||||||
|
do
|
||||||
|
if [[ -z ${ver2[i]} ]]
|
||||||
|
then
|
||||||
|
# fill empty fields in ver2 with zeros
|
||||||
|
ver2[i]=0
|
||||||
|
fi
|
||||||
|
if ((10#${ver1[i]} > 10#${ver2[i]}))
|
||||||
|
then
|
||||||
|
echo 1
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
if ((10#${ver1[i]} < 10#${ver2[i]}))
|
||||||
|
then
|
||||||
|
echo 2
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
echo 0
|
echo 0
|
||||||
return
|
return
|
||||||
|
Loading…
Reference in New Issue
Block a user