From 7a214f746bf420defbf17fa218d90d6233551bf8 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 10 Jul 2017 15:01:05 +0200 Subject: Fix upgrade peertube script (bad semver comparison) --- scripts/upgrade-peertube.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade-peertube.sh b/scripts/upgrade-peertube.sh index ff6dce94f..f7b856470 100755 --- a/scripts/upgrade-peertube.sh +++ b/scripts/upgrade-peertube.sh @@ -1,14 +1,21 @@ #!/bin/bash -nodeMinVersion="v6.0.0" +verlte() { + [ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ] +} + +nodeMinVersion="6.0.0" npmMinVersion="3.0.0" -if [[ $(node --version) < $nodeMinVersion ]]; then +actualNodeVersion=$(node --version | tr -d "v") +actualNpmVersion=$(npm --version) + +if verlte $actualNodeVersion $nodeMinVersion; then echo 'You need node >= 6' exit 0 fi -if [[ $(npm --version) < $npmMinVersion ]]; then +if verlte $actualNpmVersion $npmMinVersion; then echo 'You need npm >= 3' exit 0 fi -- cgit v1.2.3