From 26b19d07f97a62bc0b26ea61ea8fd9c61beda49b Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 29 Jun 2012 09:13:53 +0100
Subject: [PATCH] STYLE: use posix instead of bash ksh constructs (Mark Olesen)
---
etc/config/settings.sh | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index 1ece2c9cff3..f9110f768e2 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -526,13 +526,10 @@ QSMPI)
;;
SGIMPI)
- lastCharID=$(( ${#MPI_ROOT} - 1 ))
- if [ "${MPI_ROOT:$lastCharID:1}" == '/' ]
- then
- MPI_ROOT=${MPI_ROOT:0:$lastCharID}
- fi
+ # no trailing slash
+ [ "${MPI_ROOT%/}" = "${MPI_ROOT}" ] || MPI_ROOT="${MPI_ROOT%/}"
- export FOAM_MPI=${MPI_ROOT##*/}
+ export FOAM_MPI="${MPI_ROOT##*/}"
export MPI_ARCH_PATH=$MPI_ROOT
if [ ! -d "$MPI_ROOT" -o -z "$MPI_ARCH_PATH" ]
@@ -555,13 +552,10 @@ SGIMPI)
;;
INTELMPI)
- lastCharID=$(( ${#MPI_ROOT} - 1 ))
- if [ "${MPI_ROOT:$lastCharID:1}" == '/' ]
- then
- MPI_ROOT=${MPI_ROOT:0:$lastCharID}
- fi
+ # no trailing slash
+ [ "${MPI_ROOT%/}" = "${MPI_ROOT}" ] || MPI_ROOT="${MPI_ROOT%/}"
- export FOAM_MPI=${MPI_ROOT##*/}
+ export FOAM_MPI="${MPI_ROOT##*/}"
export MPI_ARCH_PATH=$MPI_ROOT
if [ ! -d "$MPI_ROOT" -o -z "$MPI_ARCH_PATH" ]
--
GitLab