Merge pull request #284 from scottmarlow/allowOverrideGLASSFISH_URL_AndRevertcheckGlassFishHomeIsSet

Allow override of glassfish url and revert check GlassFish home is set change

Author: scottmarlow

faces/bin/run-tck.sh

@@ -263,23 +263,14 @@ then
     export JEETCK_MODS=$TCK_PORTING_KIT
     export JAVAEE_HOME=$OLD_WILDFLY
     export JBOSS_HOME=$JAVAEE_HOME
-    if [[ -v GLASSFISH_HOME ]]; then
-        echo "GLASSFISH_HOME is set to: $GLASSFISH_HOME"
+    if [[ -v GLASSFISH_URL ]]; then
+        echo "GLASSFISH_URL is already set to $GLASSFISH_URL which will be used"
     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
-  
+        echo "GLASSFISH_URL is not set and will default to $GLASSFISH_URL"
     fi
+    GLASSFISH_ZIP=glassfish-7.0.0.zip
+    GLASSFISH_HOME=glassfish7
     export JAVAEE_HOME_RI=$ENV_ROOT/$GLASSFISH_HOME/glassfish
     export DERBY_HOME=$ENV_ROOT/$GLASSFISH_HOME/javadb
 
@@ -292,6 +283,13 @@ 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