Merge branch 'master' of https://github.com/openebs/maya

ng29 · Mar 28, 2017 · 7b0ec80 · 7b0ec80
2 parents 7a6ce00 + c0a049f
commit 7b0ec80
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/scripts/install_consul.sh b/scripts/install_consul.sh
@@ -6,6 +6,11 @@ CONSUL_VERSION="0.7.0"
 CURDIR=`pwd`
 
 
+if [[ $(which consul >/dev/null && consul version | head -n 1 | cut -d ' ' -f 2 | sed 's/dev//' | cut -d "'" -f 2) == "v$CONSUL_VERSION" ]]; then    
+    echo "Consul v$CONSUL_VERSION already installed; Skipping"
+    exit
+fi
+
 # Remove if already present
 # NOTE: this is install only script
 echo "Cleaning old Consul installation if any"

diff --git a/scripts/install_mayaserver.sh b/scripts/install_mayaserver.sh
@@ -2,13 +2,13 @@
 
 set -e
 
-MAPI_VERSION="0.2-RC1"
+MAPI_VERSION="0.2-RC2"
 CURDIR=`pwd`
 
-#if [[ $(which m-apiserver >/dev/null && m-apiserver version | head -n 1 | cut -d ' ' -f 2 | sed 's/dev//' | cut -d "'" -f 2) == "$MAYA_VERSION" ]]; then    
-#echo "Maya-API Server v$MAYA_VERSION already installed; Skipping"
-#    exit
-#fi
+if [[ $(which m-apiserver >/dev/null && m-apiserver version | head -n 1 | cut -d ' ' -f 2 | sed 's/dev//' | cut -d "'" -f 2) == "$MAPI_VERSION" ]]; then    
+    echo "Maya-API Server v$MAPI_VERSION already installed; Skipping"
+    exit
+fi
 
 cd /tmp/
 

diff --git a/scripts/install_nomad.sh b/scripts/install_nomad.sh
@@ -5,6 +5,11 @@ set -e
 NOMAD_VERSION="0.5.0"
 CURDIR=`pwd`
 
+if [[ $(which nomad >/dev/null && nomad version | head -n 1 | cut -d ' ' -f 2 | sed 's/dev//' | cut -d "'" -f 2) == "v$NOMAD_VERSION" ]]; then    
+    echo "Nomad v$NOMAD_VERSION already installed; Skipping"
+    exit
+fi
+
 # Remove if already present
 # NOTE: this is install only script
 echo "Cleaning old Nomad installation if any"