[embjopr-commits] EMBJOPR SVN: r802 - trunk/jsfunit/testdata.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-10-20 08:40:47 -0400 (Tue, 20 Oct 2009)
New Revision: 802

Modified:
   trunk/jsfunit/testdata/hudson_shell_script.sh
Log:
 * Hudson shell script updated - use $WINDIR instead of $USERPROFILE

Modified: trunk/jsfunit/testdata/hudson_shell_script.sh
===================================================================
--- trunk/jsfunit/testdata/hudson_shell_script.sh	2009-10-19 19:50:56 UTC (rev 801)
+++ trunk/jsfunit/testdata/hudson_shell_script.sh	2009-10-20 12:40:47 UTC (rev 802)
@@ -12,16 +12,15 @@
 #export PATH=$M2_HOME"/bin:"$PATH
 mvn -version
 
+###  Set JBoss AS home dir
+if [ -z "$JBOSS_HOME" ] ; then
 
-echo "JBOSS_HOME: $JBOSS_HOME";
+  ###  JBOSS_HOME not set, we need to get it somewhere.
 
-###  JBOSS_HOME not set, we need to get it somewhere.
-if [ -z "$JBOSS_HOME" ] ; then
-
   echo "EAP_ZIP_PATH: $EAP_ZIP_PATH";
 
   if [ -z "$EAP_ZIP_PATH" ] ; then
-    ### ??? Not set
+    ### Not set
     echo "EAP_ZIP_PATH is not set. Must be either path to EAP dist or a EAP code root dir. Terminating."
     exit -1;
   elif [ -d "$EAP_ZIP_PATH/build" ] ; then
@@ -49,10 +48,11 @@
   fi
 fi
 
+echo "JBOSS_HOME: $JBOSS_HOME"
+
+
 cd $WORKSPACE
 
-###  Set JBoss AS home dir
-echo "JBOSS_HOME: $JBOSS_HOME"
 #  Remove bundled AS console
 #  Name of war changed on 04/24 - smcgowan
 rm -rf $JBOSS_HOME/server/$JBOSS_CONFIG/deploy/admin-console.war
@@ -64,7 +64,7 @@
 
 ###  M2_SETTINGS
 M2_SETTINGS_PATH=$HOME"/.m2/settings.xml"
-if [ -n USERPROFILE ] ; then  # Windows
+if [ -n WINDIR ] ; then  # Windows
   M2_SETTINGS_PATH="h:\\hudson\\.m2\\settings.xml"
 fi