From: Daniel Farrell Date: Wed, 12 Apr 2017 15:16:25 +0000 (+0000) Subject: Merge "Replace `` cmd substitution with $()" X-Git-Tag: release/carbon~163 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=b5be33b878d75af8df189ee55974405b9a08dff1;hp=08c409cd288c13f6796d88e537c76a2b529a764b;p=releng%2Fbuilder.git Merge "Replace `` cmd substitution with $()" --- diff --git a/jjb/integration/include-raw-integration-get-bundle-vars.sh b/jjb/integration/include-raw-integration-get-bundle-vars.sh index 6b57c4027..b65eb4abb 100644 --- a/jjb/integration/include-raw-integration-get-bundle-vars.sh +++ b/jjb/integration/include-raw-integration-get-bundle-vars.sh @@ -11,13 +11,13 @@ if [ ${BUNDLEURL} == 'last' ]; then # Obtain current pom.xml of integration/distribution, correct branch. wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml" # Extract the BUNDLEVERSION from the pom.xml - BUNDLEVERSION=`xpath pom.xml '/project/version/text()' 2> /dev/null` + BUNDLEVERSION=$(xpath pom.xml '/project/version/text()' 2> /dev/null) echo "Bundle version is ${BUNDLEVERSION}" # Acquire the timestamp information from maven-metadata.xml NEXUSPATH="${NEXUSURL_PREFIX}/${ODL_NEXUS_REPO}/org/opendaylight/integration/distribution-karaf" wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml less maven-metadata.xml - TIMESTAMP=`xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null` + TIMESTAMP=$(xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null) echo "Nexus timestamp is ${TIMESTAMP}" BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}" BUNDLE="distribution-karaf-${TIMESTAMP}.zip"