diff options
| author |   C.J. Collier <cjcollier@linuxfoundation.org> | 2016-10-28 09:07:21 -0700 |
|---|---|---|
| committer | C.J. Collier <cjcollier@linuxfoundation.org> | 2016-10-28 09:07:21 -0700 |
| commit | 9004084234eff2e197542346ed6c5c998410c68d (patch) | |
| tree | b7ab1f6bd62b80b631d4cf05372c9f17c93fe79d | |
| parent | 4b7741a6745fb4382f3c632a7959eac52919d27f (diff) | |
Address change of MVN path
* set ${MAVEN_HOME} to different value depending on whether ${MVN} is set
Change-Id: I456ff57f31b4f04be5cb7aa6a3edc1d76ee56a19
Signed-off-by: C.J. Collier <cjcollier@linuxfoundation.org>
| -rw-r--r-- | jjb/nsh_sfc/include-raw-nsh_sfc-build.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/jjb/nsh_sfc/include-raw-nsh_sfc-build.sh b/jjb/nsh_sfc/include-raw-nsh_sfc-build.sh index 1257b7fb2..04383f236 100644 --- a/jjb/nsh_sfc/include-raw-nsh_sfc-build.sh +++ b/jjb/nsh_sfc/include-raw-nsh_sfc-build.sh @@ -28,7 +28,12 @@ fi echo "sha1sum of this script: ${0}" sha1sum $0 -export MAVEN_HOME="/opt/apache/maven/" +if [ -n ${MVN} ] +then + export MAVEN_HOME=$(realpath $(dirname ${MVN})/..) +else + export MAVEN_HOME="/opt/apache/maven/" +fi export PATH=${MAVEN_HOME}/bin:${PATH} scripts/ci/verify.sh |