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

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

Author: jiwils
Date: 2011-10-07 06:58:44 -0400 (Fri, 07 Oct 2011)
New Revision: 112296

Modified:
   branches/JBPAPP_5_1/main/src/bin/convert-dos2unix.sh
Log:
Fix for JBPAPP-7013.  The build breaks the script when copying it to the build/out/<version>/bin subdirectory by changing the ^M characters.

Modified: branches/JBPAPP_5_1/main/src/bin/convert-dos2unix.sh
===================================================================
--- branches/JBPAPP_5_1/main/src/bin/convert-dos2unix.sh	2011-10-07 10:38:09 UTC (rev 112295)
+++ branches/JBPAPP_5_1/main/src/bin/convert-dos2unix.sh	2011-10-07 10:58:44 UTC (rev 112296)
@@ -13,9 +13,7 @@
 EAP_ROOT=../..
 
 # Convert *.xml files.
-for i in `find $EAP_ROOT -name \*.xml`; do echo $i;sed -i 's/
-$//' $i; done
+for i in `find $EAP_ROOT -name \*.xml`; do echo $i;sed -i 's/\r$//' $i; done
 
 # Convert *.properties files.
-for i in `find $EAP_ROOT -name \*.properties`; do echo $i;sed -i 's/
-$//' $i; done
+for i in `find $EAP_ROOT -name \*.properties`; do echo $i;sed -i 's/\r$//' $i; done