From 2fba6fa7997066adfbe02e92cd22ea75018f4fe7 Mon Sep 17 00:00:00 2001 From: Fede Date: Tue, 27 Feb 2018 23:53:27 +0100 Subject: Fix prerequisites checker so 1.10 > 1.9 (#8344) * Fix prerequisites checker so 1.10 > 1.9 * Check prerequisites sorting by dot separator --- scripts/prereq-check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/prereq-check.sh') diff --git a/scripts/prereq-check.sh b/scripts/prereq-check.sh index 1c9ae8405..6f2954273 100755 --- a/scripts/prereq-check.sh +++ b/scripts/prereq-check.sh @@ -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 \ No newline at end of file +check_prereq 'docker' $REQUIREDDOCKERVERSION $DOCKERVERSION -- cgit v1.2.3-1-g7c22