1 files changed, 11 insertions, 15 deletions
diff --git a/cje-production/mbscripts/mb020_createBaseBuilder.sh b/cje-production/mbscripts/mb020_createBaseBuilder.sh
index 01612af3b..096e5b9d3 100755
--- a/cje-production/mbscripts/mb020_createBaseBuilder.sh
+++ b/cje-production/mbscripts/mb020_createBaseBuilder.sh
@@ -22,22 +22,18 @@ fi
 source $CJE_ROOT/scripts/common-functions.shsource
 source $1
 
-qualifiedBaseBuilder="$CJE_ROOT/$BASEBUILDER_DIR"
-TMP="$CJE_ROOT/$BASEBUILDER_DIR/tmp"
-mkdir -p $TMP
-pushd $TMP
+mkdir -p $CJE_ROOT/$TMP_DIR
+pushd $CJE_ROOT/$TMP_DIR
 wget -O eclipsePlatform.tar.gz https://$DOWNLOAD_HOST/eclipse/downloads/drops4/$PREVIOUS_RELEASE_ID/eclipse-platform-${PREVIOUS_RELEASE_VER}-linux-gtk-x86_64.tar.gz
 tar zxf eclipsePlatform.tar.gz
 popd
 
-${TMP}/eclipse/eclipse -nosplash \
-      -debug -consolelog -data ${TMP}/workspace-toolsinstall \
-      -application org.eclipse.equinox.p2.director \
-      -repository \
-      ${ECLIPSE_RUN_REPO},${BUILDTOOLS_REPO},${WEBTOOLS_REPO} \
-      -installIU \
-      org.eclipse.platform.ide,org.eclipse.pde.api.tools,org.eclipse.releng.build.tools.feature.feature.group,org.eclipse.wtp.releng.tools.feature.feature.group/${WEBTOOLS_VER},org.apache.derby.core.feature.feature.group \
-      -destination \
-      ${qualifiedBaseBuilder} \
-      -profile \
-      SDKProfile &
+$CJE_ROOT/$TMP_DIR/eclipse/eclipse -nosplash \
+  -debug -consolelog -data $CJE_ROOT/$TMP_DIR/workspace-toolsinstall \
+  -application org.eclipse.equinox.p2.director \
+  -repository ${ECLIPSE_RUN_REPO},${BUILDTOOLS_REPO},${WEBTOOLS_REPO} \
+  -installIU org.eclipse.platform.ide,org.eclipse.pde.api.tools,org.eclipse.releng.build.tools.feature.feature.group,org.eclipse.wtp.releng.tools.feature.feature.group/${WEBTOOLS_VER},org.apache.derby.core.feature.feature.group \
+  -destination $CJE_ROOT/$BASEBUILDER_DIR \
+  -profile SDKProfile
+
+fn-write-property LAUNCHER_JAR \"$(find $CJE_ROOT/$BASEBUILDER_DIR -name org.eclipse.equinox.launcher_*.jar | tail -1)\"