From ff07ae152004c5b7737cf2d8b9de3bc3c57edb69 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 16 Jan 2018 12:00:21 +0100 Subject: [PATCH] CONFIG: typo in config.csh/mpi - also handle stray semi-colons in foamCleanPath. Treat like a ':' separator. They are incorrect and potentially problematic for shell evals. --- bin/foamCleanPath | 4 ++-- etc/config.csh/mpi | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/foamCleanPath b/bin/foamCleanPath index 1fb86152d5..5d197ac0b1 100755 --- a/bin/foamCleanPath +++ b/bin/foamCleanPath @@ -181,7 +181,7 @@ fi # or may contain ':' separators oldIFS="$IFS" # Preserve initial IFS -IFS=': ' # Split on colon, whitespace +IFS=':; ' # Split on colon, whitespace (semi-colon for good measure) set -- $* if [ -n "$optVerbose" ] @@ -203,7 +203,7 @@ do done printDebug "intermediate>$dirList<" -IFS=': ' # Split on colon, whitespace (to avoid surprises) +IFS=':; ' # Split on colon, whitespace (semi-colon for good measure) set -- $dirList IFS="$oldIFS" # Restore initial IFS diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi index 795b62f4c8..75c8ffec1e 100644 --- a/etc/config.csh/mpi +++ b/etc/config.csh/mpi @@ -56,7 +56,7 @@ case OPENMPI: # Respect MPI_ARCH_PATH if set to a valid directory (ie, from user adjustments) if (! $?MPI_ARCH_PATH ) setenv MPI_ARCH_PATH if (! -d "$MPI_ARCH_PATH" ) then - setenv mpiDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI + setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI endif # Inform openmpi where to find its install directory