Repository: cloudstack Updated Branches: refs/heads/master 0e31366a3 -> b3281eef1
mvn on buildslaves that don't have it in path Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/45a3ad21 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/45a3ad21 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/45a3ad21 Branch: refs/heads/master Commit: 45a3ad21861f97089746983be442bece5511f7b8 Parents: 39dce59 Author: Daan Hoogland <dhoogl...@schubergphilis.com> Authored: Thu Feb 19 11:58:40 2015 +0100 Committer: Daan Hoogland <dhoogl...@schubergphilis.com> Committed: Thu Feb 19 11:58:40 2015 +0100 ---------------------------------------------------------------------- packaging/package.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/45a3ad21/packaging/package.sh ---------------------------------------------------------------------- diff --git a/packaging/package.sh b/packaging/package.sh index 51a80ef..ae15627 100755 --- a/packaging/package.sh +++ b/packaging/package.sh @@ -48,7 +48,14 @@ function packaging() { fi DISTRO=$3 - + MVN=`which mvn` + if [ -z "$MVN" ] ; then + MVN=`locate bin/mvn | grep -e mvn$ | tail -1` + if [ -z "$MVN" ] ; then + echo "mvn not found\n cannot retrieve version to package\n RPM Build Failed" + exit 2 + fi + fi VERSION=`(cd ../; mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version) | grep --color=none '^[0-9]\.'` if echo $VERSION | grep -q SNAPSHOT ; then REALVER=`echo $VERSION | cut -d '-' -f 1`
