Merge pull request #281 from scottmarlow/checkGlassFishHomeIsSet

Work around FacesOld TCK runner failing to download GlassFish

Author: scottmarlow

faces/bin/run-tck.sh

@@ -263,10 +263,23 @@ then
     export JEETCK_MODS=$TCK_PORTING_KIT
     export JAVAEE_HOME=$OLD_WILDFLY
     export JBOSS_HOME=$JAVAEE_HOME
-
-    GLASSFISH_URL=https://download.eclipse.org/ee4j/glassfish/glassfish-7.0.0.zip
-    GLASSFISH_ZIP=glassfish-7.0.0.zip
-    GLASSFISH_HOME=glassfish7
+    if [[ -v GLASSFISH_HOME ]]; then
+        echo "GLASSFISH_HOME is set to: $GLASSFISH_HOME"
+    else
+        echo "GLASSFISH_HOME is not set."
+        GLASSFISH_URL=https://download.eclipse.org/ee4j/glassfish/glassfish-7.0.0.zip
+        GLASSFISH_ZIP=glassfish-7.0.0.zip
+        GLASSFISH_HOME=glassfish7
+    
+        if ! test -d $GLASSFISH_HOME
+            then
+            echo "Installing GlassFish"
+            curl -L $GLASSFISH_URL -o $GLASSFISH_ZIP
+            unzip ${UNZIP_ARGS} $GLASSFISH_ZIP
+        fi
+      fi
+  
+    fi
     export JAVAEE_HOME_RI=$ENV_ROOT/$GLASSFISH_HOME/glassfish
     export DERBY_HOME=$ENV_ROOT/$GLASSFISH_HOME/javadb
 
@@ -279,13 +292,6 @@ then
     echo "export JAVAEE_HOME_RI=$JAVAEE_HOME_RI" >> environment
     echo "export DERBY_HOME=$DERBY_HOME" >> environment
 
-    if ! test -d $GLASSFISH_HOME
-    then
-        echo "Installing GlassFish"
-        curl -L $GLASSFISH_URL -o $GLASSFISH_ZIP
-        unzip ${UNZIP_ARGS} $GLASSFISH_ZIP
-    fi
-
     echo "Cloning WildFly " $WILDFLY_HOME $OLD_WILDFLY
     cp -R $WILDFLY_HOME $OLD_WILDFLY
     popd # out of WORK_DIR