From da49da2325d96f6d1890497650f47d2e43ea8eb0 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Tue, 12 Nov 2013 17:54:49 +0100 Subject: [PATCH] some files that are created on windows have \r to trim as well --- src/smpi/smpirun.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.20.1