Using bash to run install script

openebs-archive · Mar 10, 2017 · 571314c · 571314c
1 parent 7bfa23a
commit 571314c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/command/install_maya.go b/command/install_maya.go
@@ -170,7 +170,7 @@ func (c *InstallMayaCommand) installMayaserver() int {
 
 	var runop int = 0
 
-	c.Cmd = exec.Command("sh", InstallMayaserverScript)
+	c.Cmd = exec.Command("bash", InstallMayaserverScript)
 
 	if runop = execute(c.Cmd, c.M.Ui); runop != 0 {
 		c.M.Ui.Error("Install failed: Error installing mayaserver")

diff --git a/scripts/install_bootstrap.sh b/scripts/install_bootstrap.sh
@@ -60,7 +60,7 @@ cd /etc/maya.d/templates
 
 echo "Fetching mayaserver config templates ..."
 curl -sSL https://raw.githubusercontent.com/openebs/maya/master/templates/mayaserver.service.tmpl -o mayaserver.service.tmpl
-curl -sSL https://raw.githubusercontent.com/openebs/maya/master/templates/nomad_global.INI.tmpl -o nomad_global.INI
+curl -sSL https://raw.githubusercontent.com/openebs/maya/master/templates/nomad_global.INI.tmpl -o nomad_global.INI.tmpl
 
 echo "Fetching consul config templates ..."
 curl -sSL https://raw.githubusercontent.com/openebs/maya/master/templates/consul-server.json.tmpl -o consul-server.json.tmpl

diff --git a/scripts/install_mayaserver.sh b/scripts/install_mayaserver.sh
@@ -5,8 +5,8 @@ set -e
 MAYA_VERSION="0.0.4"
 CURDIR=`pwd`
 
-if [ `mayaserver version | head -n 1 | cut -d ' ' -f 2 | sed 's/dev//' | cut -d "'" -f 2` = $MAYA_VERSION ]; then
-    echo "Mayaserver v$MAYA_VERSION already installed; Skipping"
+if [[ $(which mayaserver >/dev/null && mayaserver version | head -n 1 | cut -d ' ' -f 2 | sed 's/dev//' | cut -d "'" -f 2) == "$MAYA_VERSION" ]]; then    
+echo "Mayaserver v$MAYA_VERSION already installed; Skipping"
     exit
 fi