diff options
| author | David Williams | 2016-08-05 15:18:26 +0000 |
|---|---|---|
| committer | David Williams | 2016-08-05 15:18:26 +0000 |
| commit | da9756d2914d68d32db1fba1248c08a4aedd7124 (patch) | |
| tree | 948cee4b7fd70507983ae1eb09a01292dd916749 | |
| parent | b7f2f3a4042e42d5ac0e84d9f7af4b6a82c277a3 (diff) | |
| download | eclipse.platform.releng.aggregator-da9756d2914d68d32db1fba1248c08a4aedd7124.tar.gz eclipse.platform.releng.aggregator-da9756d2914d68d32db1fba1248c08a4aedd7124.tar.xz eclipse.platform.releng.aggregator-da9756d2914d68d32db1fba1248c08a4aedd7124.zip | |
Bug 499246 - Should not define WORKSPACE if it is not already defined.
Change-Id: I38f671c3d327c7113e651294d7a8efb204514cf7
| -rwxr-xr-x | production/sdk/promoteStableRelease/promote/promoteSites.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/production/sdk/promoteStableRelease/promote/promoteSites.sh b/production/sdk/promoteStableRelease/promote/promoteSites.sh index 730734b6e..d3904bd6d 100755 --- a/production/sdk/promoteStableRelease/promote/promoteSites.sh +++ b/production/sdk/promoteStableRelease/promote/promoteSites.sh @@ -175,7 +175,6 @@ fi if [[ -z "${WORKSPACE}" ]] then export UTILITIES_HOME=/shared/eclipse - export WORKSPACE=/shared/eclipse else export UTILITIES_HOME=${WORKSPACE}/utilities/production fi @@ -186,7 +185,15 @@ export PROMOTE_IMPL=${UTILITIES_HOME}/sdk/promoteStableRelease/promoteImpl #export CL_SITE=${CL_SITE:-${UTILITIES_HOME}/sdk/promoteStableRelease/promote${TRAIN_NAME}} # stage 2 directory should be "outside" the normal working tree export STAGE2DIRSEG=stage2output${TRAIN_NAME}${CHECKPOINT} -export CL_SITE=${WORKSPACE}/${STAGE2DIRSEG} +# Here we intentionally use WORKSPACE, if it is defined, +# instead of UTILITIES_HOME to make it easier to find. +# else use PWD +if [[ -z "${WORKSPACE}" ]] +then + export CL_SITE=${PWD}/${STAGE2DIRSEG} +else + export CL_SITE=${WORKSPACE}/${STAGE2DIRSEG} +fi mkdir -p "${CL_SITE}" "${PROMOTE_IMPL}/promoteSitesCore.sh" 2>&1 | tee ${CL_SITE}/stage1PromotionLog.txt |