From: Andrew Grimberg Date: Thu, 8 Sep 2016 23:28:23 +0000 (+0000) Subject: Merge "Fix shellcheck errors for include-raw-nsh_sfc-pkg-push.sh" X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=20148d10ab4d0753ca16e058b52e3d0a25dab08b;p=ci-management.git Merge "Fix shellcheck errors for include-raw-nsh_sfc-pkg-push.sh" --- 20148d10ab4d0753ca16e058b52e3d0a25dab08b diff --cc jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh index 74dccf118,79a3827d8..0f30ff4c9 --- a/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh +++ b/jjb/nsh_sfc/include-raw-nsh_sfc-pkg-push.sh @@@ -1,12 -1,10 +1,12 @@@ #!/bin/bash # basic build script example set -e -o pipefail - if [ "${OS}" == "ubuntu1404" ]; then + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ + export JAVAC=${JAVA_HOME}/bin/javac + export PATH=${JAVA_HOME}/bin/:${PATH} cd nsh-plugin/build/java/jvpp $MVN deploy \ - -gs $GLOBAL_SETTINGS_FILE -s $SETTINGS_FILE + -gs "$GLOBAL_SETTINGS_FILE" -s "$SETTINGS_FILE" cd - fi