@@ -263,23 +263,10 @@ then
263263 export JEETCK_MODS=$TCK_PORTING_KIT
264264 export JAVAEE_HOME=$OLD_WILDFLY
265265 export JBOSS_HOME=$JAVAEE_HOME
266- if [[ -v GLASSFISH_HOME ]]; then
267- echo " GLASSFISH_HOME is set to: $GLASSFISH_HOME "
268- else
269- echo " GLASSFISH_HOME is not set."
270- GLASSFISH_URL=https://download.eclipse.org/ee4j/glassfish/glassfish-7.0.0.zip
271- GLASSFISH_ZIP=glassfish-7.0.0.zip
272- GLASSFISH_HOME=glassfish7
273-
274- if ! test -d $GLASSFISH_HOME
275- then
276- echo " Installing GlassFish"
277- curl -L $GLASSFISH_URL -o $GLASSFISH_ZIP
278- unzip ${UNZIP_ARGS} $GLASSFISH_ZIP
279- fi
280- fi
281-
282- fi
266+
267+ GLASSFISH_URL=https://download.eclipse.org/ee4j/glassfish/glassfish-7.0.0.zip
268+ GLASSFISH_ZIP=glassfish-7.0.0.zip
269+ GLASSFISH_HOME=glassfish7
283270 export JAVAEE_HOME_RI=$ENV_ROOT /$GLASSFISH_HOME /glassfish
284271 export DERBY_HOME=$ENV_ROOT /$GLASSFISH_HOME /javadb
285272
@@ -292,6 +279,13 @@ then
292279 echo " export JAVAEE_HOME_RI=$JAVAEE_HOME_RI " >> environment
293280 echo " export DERBY_HOME=$DERBY_HOME " >> environment
294281
282+ if ! test -d $GLASSFISH_HOME
283+ then
284+ echo " Installing GlassFish"
285+ curl -L $GLASSFISH_URL -o $GLASSFISH_ZIP
286+ unzip ${UNZIP_ARGS} $GLASSFISH_ZIP
287+ fi
288+
295289 echo " Cloning WildFly " $WILDFLY_HOME $OLD_WILDFLY
296290 cp -R $WILDFLY_HOME $OLD_WILDFLY
297291 popd # out of WORK_DIR
0 commit comments