From e5c722ba38aee2f3132187e97925ac9e5f75f4fe Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Tue, 7 Mar 2017 13:25:13 +0100 Subject: [PATCH] Revert "Modify get bundle script to deal with "... This reverts commit fb393296a14f5d34ec67e74a191e06e4b702fbe0. I believe distribution-check now uses different script and current BUNDLEFOLDER computation is wrong fro direct Nexus link (as opposed to 'last'). Change-Id: I93c88f4a7c921e152506706570cb1c1c9948c6f9 Signed-off-by: Vratko Polak --- jjb/integration/include-raw-integration-get-bundle-vars.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jjb/integration/include-raw-integration-get-bundle-vars.sh b/jjb/integration/include-raw-integration-get-bundle-vars.sh index 6c5f5cb46..9772004f3 100644 --- a/jjb/integration/include-raw-integration-get-bundle-vars.sh +++ b/jjb/integration/include-raw-integration-get-bundle-vars.sh @@ -25,8 +25,8 @@ if [ ${BUNDLEURL} == 'last' ]; then else ACTUALBUNDLEURL="${BUNDLEURL}" BUNDLE="${BUNDLEURL##*/}" - BUNDLEFOLDER="${BUNDLE//.zip}" - BUNDLEVERSION="${BUNDLEFOLDER//distribution-karaf-}" + BUNDLEVERSION="$(basename $(dirname $BUNDLEURL))" + BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}" fi if [ ${JDKVERSION} == 'openjdk8' ]; then -- 2.36.6