]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
Fix upgrade peertube script (bad semver comparison)
authorChocobozzz <florian.bigard@gmail.com>
Mon, 10 Jul 2017 13:01:05 +0000 (15:01 +0200)
committerChocobozzz <florian.bigard@gmail.com>
Mon, 10 Jul 2017 13:01:05 +0000 (15:01 +0200)
scripts/upgrade-peertube.sh

index ff6dce94f4d8d25a6648f6cb4a64bc0bf98bed4d..f7b8564707d2eaa1038d0aba99a22293374c1ae4 100755 (executable)
@@ -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