Modify artifact version for Workflow

[vfc/nfvo/wfengine.git] / wfenginemgrservice / src / main / docker / wfenginemgrservice-docker-build_image.sh

diff --git a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
index 52595da..224e62d 100644 (file)
--- a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
+++ b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
@@ -1,4 +1,4 @@
-#!/bin/bash\r
+#!/usr/bin/env /bin/bash\r
 \r
 DIRNAME=`dirname $0`\r
 DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`\r
@@ -16,8 +16,26 @@ IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
 \r
 POM_DIR="../../../"\r
 cd ${POM_DIR}\r
-VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate|grep '^VER'|cut -f2|echo)\r
-# VERSION=$(printf 'VER\t${project.version}'|mvn help:evaluate)\r
+\r
+mvncmd=$(whereis mvn | grep ^mvn |awk '{print $2}')\r
+echo mvncmd=$mvncmd\r
+if [[ 1$mvncmd != 1 ]]; then\r
+  echo $mvncmd\r
+elif [ $MVN ]; then\r
+  mvncmd=$MVN\r
+elif [ $M2_HOME ]; then\r
+  mvncmd=$M2_HOME/bin/mvn\r
+elif [ -f "/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn" ]; then\r
+  mvncmd="/w/tools/hudson.tasks.Maven_MavenInstallation/mvn33/bin/mvn"\r
+elif [ -f "/usr/share/maven/bin/mvn" ]; then\r
+  mvncmd="/usr/share/maven/bin/mvn"\r
+else\r
+  echo "Maven is not installed, mvncmd=$mvncmd"\r
+  exit 1\r
+fi\r
+\r
+pwd\r
+VERSION=$(printf 'VER\t${project.version}'|$mvncmd help:evaluate|grep '^VER'|cut -f2)\r
 echo "VERSION=${VERSION}"\r
 \r
 cd ${DOCKER_BUILD_DIR}\r