[jboss-cvs] JBossAS SVN: r112301 - branches/JBPAPP_5_1/main/src/bin.

[jboss-cvs-commits at lists.jboss.org]

Author: jiwils
Date: 2011-10-09 18:58:15 -0400 (Sun, 09 Oct 2011)
New Revision: 112301

Modified:
   branches/JBPAPP_5_1/main/src/bin/convert-dos2unix.sh
Log:
Fix for JBPAPP-7350.  JBOSS_HOME is now taken into account, and EAP_ROOT is generated dynamically based on script name.

Modified: branches/JBPAPP_5_1/main/src/bin/convert-dos2unix.sh
===================================================================
--- branches/JBPAPP_5_1/main/src/bin/convert-dos2unix.sh	2011-10-08 10:19:30 UTC (rev 112300)
+++ branches/JBPAPP_5_1/main/src/bin/convert-dos2unix.sh	2011-10-09 22:58:15 UTC (rev 112301)
@@ -10,8 +10,15 @@
 
 # This script lives in jboss-eap-<version>/jboss-as/bin, so we set the root
 # directory for the changes accordingly.  This can be changed as necessary.
-EAP_ROOT=../..
+DIRNAME=`dirname $0`
 
+if [ "x$JBOSS_HOME" = "x" ]; then
+    # get the full path (without any relative bits)
+    JBOSS_HOME=`cd $DIRNAME/..; pwd`
+fi
+
+EAP_ROOT=`cd $JBOSS_HOME/..; pwd`
+
 # Convert *.xml files.
 for i in `find $EAP_ROOT -name \*.xml`; do echo $i;sed -i 's/\r$//' $i; done