do not repeat unnecessary path prefix
diff --git a/hudson-scripts/init/3_update-site-publish.sh b/hudson-scripts/init/3_update-site-publish.sh
index 619b5d6..1069269 100644
--- a/hudson-scripts/init/3_update-site-publish.sh
+++ b/hudson-scripts/init/3_update-site-publish.sh
@@ -25,7 +25,7 @@
_updateLatestUpdateSite() {
local updateHome="${1}"
- local absolutePathToLatest="${2}"
+ local absolutePathToLatest="${updateHome}${2:+/${2}}"
local prefix="${3}"
local latestRepoLabel="${4}"
@@ -53,18 +53,19 @@
local repoLabelPrefix="${projectName}${stream:+ ${stream}${STREAM_NAME_SUFFIX}}"
- local streamPath="${updateHome}${stream:+/${STREAMS_FOLDER}/${stream}${STREAM_NAME_SUFFIX}}"
- local relPathToUpdateSite=$( relativize "${streamPath}" "${updateHome}/${qualifiedVersion}" )
+ local streamPath="${stream:+${STREAMS_FOLDER}/${stream}${STREAM_NAME_SUFFIX}}"
+ local streamAbsolutePath="${updateHome}${streamPath:+/${streamPath}}"
+ local relPathToUpdateSite=$( relativize "${streamAbsolutePath}" "${updateHome}/${qualifiedVersion}" )
- LSDEBUG "Adding '${relPathToUpdateSite}' to composite repository '${streamPath}'"
+ LSDEBUG "Adding '${relPathToUpdateSite}' to composite repository '${streamAbsolutePath}'"
compositeRepository \
- -location "${streamPath}" \
+ -location "${streamAbsolutePath}" \
-add "${relPathToUpdateSite}" \
-repositoryName "${repoLabelPrefix} ${category} builds" \
-compressed
- createP2Index "${streamPath}"
+ createP2Index "${streamAbsolutePath}"
- LSDEBUG "Updating latest of stream '${stream}${STREAM_NAME_SUFFIX}' @ '${streamPath}'"
+ LSDEBUG "Updating latest of stream '${stream}${STREAM_NAME_SUFFIX}' @ '${streamAbsolutePath}'"
_updateLatestUpdateSite "${updateHome}" "${streamPath}${streamPath:+/}${LATEST_FOLDER}" "${stream}" "${repoLabelPrefix} latest ${category} build"
}
diff --git a/hudson-scripts/init/4_update-site-clean.sh b/hudson-scripts/init/4_update-site-clean.sh
index ad35e29..22131c0 100644
--- a/hudson-scripts/init/4_update-site-clean.sh
+++ b/hudson-scripts/init/4_update-site-clean.sh
@@ -13,7 +13,7 @@
_cleanNightly() {
local updateHome="${1}"
local updateURL="${2}"
- local streamPath="${3}"
+ local streamPath="${updateHome}${3:+/${3}}"
local updateSiteToClean="${4}"
local latestInStreamPath="${streamPath}/${LATEST_FOLDER}"
@@ -70,8 +70,8 @@
if [ ${nbBuildToKeep} -gt 0 ]; then
local updateSiteToKeep=( $(echo ${foldersWithUnqualifiedVersionPrefix[@]} | tr ' ' '\n' | sort -r | head -n ${nbBuildToKeep}) )
- local UNION=( ${updateSiteToKeep[@]} ${foldersWithUnqualifiedVersionPrefix[@]} )
- local updateSitesToClean=( $(echo ${UNION[@]} | tr ' ' '\n' | sort | uniq -u) )
+ local union=( ${updateSiteToKeep[@]} ${foldersWithUnqualifiedVersionPrefix[@]} )
+ local updateSitesToClean=( $(echo ${union[@]} | tr ' ' '\n' | sort | uniq -u) )
else
local updateSitesToClean=( $(echo ${foldersWithUnqualifiedVersionPrefix[@]} | tr ' ' '\n' | sort) )
fi
@@ -83,18 +83,18 @@
local _majorVersion="$(majorVersion ${unqualifiedVersion})"
for updateSiteToClean in ${updateSitesToClean[@]}; do
- _cleanNightly "${updateHome}" "${updateURL}" "${updateHome}/${STREAMS_FOLDER}/${unqualifiedVersion}${STREAM_NAME_SUFFIX}" "${updateSiteToClean}"
- _cleanNightly "${updateHome}" "${updateURL}" "${updateHome}/${STREAMS_FOLDER}/${_minorVersion}${STREAM_NAME_SUFFIX}" "${updateSiteToClean}"
- _cleanNightly "${updateHome}" "${updateURL}" "${updateHome}/${STREAMS_FOLDER}/${_majorVersion}${STREAM_NAME_SUFFIX}" "${updateSiteToClean}"
- _cleanNightly "${updateHome}" "${updateURL}" "${updateHome}" "${updateSiteToClean}"
+ _cleanNightly "${updateHome}" "${updateURL}" "${STREAMS_FOLDER}/${unqualifiedVersion}${STREAM_NAME_SUFFIX}" "${updateSiteToClean}"
+ _cleanNightly "${updateHome}" "${updateURL}" "${STREAMS_FOLDER}/${_minorVersion}${STREAM_NAME_SUFFIX}" "${updateSiteToClean}"
+ _cleanNightly "${updateHome}" "${updateURL}" "${STREAMS_FOLDER}/${_majorVersion}${STREAM_NAME_SUFFIX}" "${updateSiteToClean}"
+ _cleanNightly "${updateHome}" "${updateURL}" "" "${updateSiteToClean}"
LSINFO "Removing folder '${updateHome}/${updateSiteToClean}'"
rm -rf "${updateHome}/${updateSiteToClean}"
done
- _updateLatestUpdateSite "${updateHome}" "${updateHome}/${STREAMS_FOLDER}/${unqualifiedVersion}${STREAM_NAME_SUFFIX}/${LATEST_FOLDER}" "${unqualifiedVersion}" "${projectName} ${unqualifiedVersion}${STREAM_NAME_SUFFIX} latest ${category} build"
- _updateLatestUpdateSite "${updateHome}" "${updateHome}/${STREAMS_FOLDER}/${_minorVersion}${STREAM_NAME_SUFFIX}/${LATEST_FOLDER}" "${_minorVersion}" "${projectName} ${_minorVersion}${STREAM_NAME_SUFFIX} latest ${category} build"
- _updateLatestUpdateSite "${updateHome}" "${updateHome}/${STREAMS_FOLDER}/${_majorVersion}${STREAM_NAME_SUFFIX}/${LATEST_FOLDER}" "${_majorVersion}" "${projectName} ${_majorVersion}${STREAM_NAME_SUFFIX} latest ${category} build"
- _updateLatestUpdateSite "${updateHome}" "${updateHome}/${LATEST_FOLDER}" "" "${projectName} latest ${category} build"
+ _updateLatestUpdateSite "${updateHome}" "${STREAMS_FOLDER}/${unqualifiedVersion}${STREAM_NAME_SUFFIX}/${LATEST_FOLDER}" "${unqualifiedVersion}" "${projectName} ${unqualifiedVersion}${STREAM_NAME_SUFFIX} latest ${category} build"
+ _updateLatestUpdateSite "${updateHome}" "${STREAMS_FOLDER}/${_minorVersion}${STREAM_NAME_SUFFIX}/${LATEST_FOLDER}" "${_minorVersion}" "${projectName} ${_minorVersion}${STREAM_NAME_SUFFIX} latest ${category} build"
+ _updateLatestUpdateSite "${updateHome}" "${STREAMS_FOLDER}/${_majorVersion}${STREAM_NAME_SUFFIX}/${LATEST_FOLDER}" "${_majorVersion}" "${projectName} ${_majorVersion}${STREAM_NAME_SUFFIX} latest ${category} build"
+ _updateLatestUpdateSite "${updateHome}" "${LATEST_FOLDER}" "" "${projectName} latest ${category} build"
fi
}
