From: Augustin Degomme <degomme@idpann.imag.fr>
Date: Tue, 12 Nov 2013 16:54:49 +0000 (+0100)
Subject: some files that are created on windows have \r to trim as well
X-Git-Tag: v3_11_beta~337
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/da49da2325d96f6d1890497650f47d2e43ea8eb0?ds=sidebyside

some files that are created on windows have \r to trim as well
---

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index 805bfb37c1..23eb8078f4 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -273,14 +273,14 @@ APPLICATIONHEAD
 
 ##---- cache hostnames of hostfile---------------
 if [ -n "${HOSTFILE}" ] && [ -f ${HOSTFILE} ]; then
-  hostnames=$(cat ${HOSTFILE} | tr \\\n " ")
+  hostnames=$(cat ${HOSTFILE} | tr \\\n\\\r " ")
   NUMHOSTS=$(cat ${HOSTFILE} | wc -l)
 fi
 
 if [ "${EXTOPT}" = "smpi_replay" ]; then
   APP_TRACES=$PROC_ARGS
   if [ -n "${APP_TRACES}" ] && [ -f "${APP_TRACES}" ]; then
-     hosttraces=$(cat ${APP_TRACES} | tr \\\n " ")
+     hosttraces=$(cat ${APP_TRACES} | tr \\\n\\\r ' ' )
      NUMTRACES=$(cat ${APP_TRACES} | wc -l)
   else
      printf "File not found: %s\n", "${APP_TRACES:-\${APP_TRACES\}}" >&2