diff options
| author | Fede <gnufede@gmail.com> | 2018-02-27 23:53:27 +0100 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-27 17:53:27 -0500 |
| commit | 2fba6fa7997066adfbe02e92cd22ea75018f4fe7 (patch) | |
| tree | e3e63e6a3e40c8a951123091fb0b4a1196015456 /scripts | |
| parent | 2782602c6e9bed74443210d205d2ddf756aea44f (diff) | |
| download | chat-2fba6fa7997066adfbe02e92cd22ea75018f4fe7.tar.gz chat-2fba6fa7997066adfbe02e92cd22ea75018f4fe7.tar.bz2 chat-2fba6fa7997066adfbe02e92cd22ea75018f4fe7.zip | |
Fix prerequisites checker so 1.10 > 1.9 (#8344)
* Fix prerequisites checker so 1.10 > 1.9
* Check prerequisites sorting by dot separator
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/prereq-check.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 |