From 70f3947c48ce3e0ff2550961e73464336b9eb9bb Mon Sep 17 00:00:00 2001 From: Henry Weller <http://cfd.direct> Date: Wed, 8 Jun 2016 11:51:21 +0100 Subject: [PATCH] etc/bashrc,cshrc: Use "$WM_PROJECT" rather than "OpenFOAM" in the setting of $FOAM_INST_DIR Patch contributed by Bruno Santos Resolves patch request http://bugs.openfoam.org/view.php?id=2112 --- etc/bashrc | 2 +- etc/cshrc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/bashrc b/etc/bashrc index 3394c0894f8..4df0d6c3754 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -44,7 +44,7 @@ export WM_PROJECT_VERSION=dev # [ $BASH_SOURCE ] && \ export FOAM_INST_DIR=${BASH_SOURCE%/*/*/*} || \ -export FOAM_INST_DIR=$HOME/OpenFOAM +export FOAM_INST_DIR=$HOME/$WM_PROJECT # export FOAM_INST_DIR=~$WM_PROJECT # export FOAM_INST_DIR=/opt/$WM_PROJECT # export FOAM_INST_DIR=/usr/local/$WM_PROJECT diff --git a/etc/cshrc b/etc/cshrc index 13e7177a7fb..2fac1a1c831 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -41,8 +41,8 @@ setenv WM_PROJECT_VERSION dev # # Please set to the appropriate path if the default is not correct. # -setenv FOAM_INST_DIR `lsof +p $$ |& grep -oE '/.*OpenFOAM[^/]*/etc/cshrc' | \ - sed 's%/OpenFOAM[^/]*/etc/cshrc%%'` +setenv FOAM_INST_DIR `lsof +p $$ |& grep -oE '/.*'$WM_PROJECT'[^/]*/etc/cshrc' | \ + sed 's%/'$WM_PROJECT'[^/]*/etc/cshrc%%'` echo $FOAM_INST_DIR # setenv FOAM_INST_DIR $HOME/$WM_PROJECT # setenv FOAM_INST_DIR ~$WM_PROJECT -- GitLab