Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "Modify get bundle script to deal with "...
[releng/builder.git]
/
jjb
/
integration
/
include-raw-integration-get-bundle-vars.sh
diff --git
a/jjb/integration/include-raw-integration-get-bundle-vars.sh
b/jjb/integration/include-raw-integration-get-bundle-vars.sh
index 6c5f5cb467ca5193640c2bf13167d898cbc7e424..9772004f3c37f17592ea215fdc4c9ce273fde43d 100644
(file)
--- 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##*/}"
else
ACTUALBUNDLEURL="${BUNDLEURL}"
BUNDLE="${BUNDLEURL##*/}"
- BUNDLE
FOLDER="${BUNDLE//.zip}
"
- BUNDLE
VERSION="${BUNDLEFOLDER//distribution-karaf-
}"
+ BUNDLE
VERSION="$(basename $(dirname $BUNDLEURL))
"
+ BUNDLE
FOLDER="distribution-karaf-${BUNDLEVERSION
}"
fi
if [ ${JDKVERSION} == 'openjdk8' ]; then
fi
if [ ${JDKVERSION} == 'openjdk8' ]; then