Fix prerequisites checker so 1.10 > 1.9 (#8344)

* Fix prerequisites checker so 1.10 > 1.9

* Check prerequisites sorting by dot separator
This commit is contained in:
Fede
2018-02-27 23:53:27 +01:00
committed by Derrick Anderson
parent 2782602c6e
commit 2fba6fa799

View File

@@ -2,7 +2,7 @@
check_version()
{
local version=$1 check=$2
local winner=$(echo -e "$version\n$check" | sed '/^$/d' | sort -nr | head -1)
local winner=$(echo -e "$version\n$check" | sed '/^$/d' | sort -t. -s -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr | head -1)
[[ "$winner" = "$version" ]] && return 0
return 1
}
@@ -46,4 +46,4 @@ DOCKERVERSION=$(docker version --format '{{.Server.Version}}' | sed 's/[a-z-]//g
check_prereq 'node' $REQUIREDNODEVERSION $NODEVERSION
check_prereq 'npm' $REQUIREDNPMVERSION $NPMVERSION
check_prereq 'go' $REQUIREDGOVERSION $GOVERSION
check_prereq 'docker' $REQUIREDDOCKERVERSION $DOCKERVERSION
check_prereq 'docker' $REQUIREDDOCKERVERSION $DOCKERVERSION