mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-12-28 03:37:59 +00:00
CONFIG: eliminate most occurances of outdated FOAM_INST_DIR (issue #444)
- since 1612, FOAM_INST_DIR and foamInstDir longer have any special meanings when sourcing the bashrc or cshrc files. Thus no need for special treatment in any of the dispatch wrappers. Retained FOAM_INST_DIR as (unexported) variable in etc/bashrc, just in case people are using patched versions of etc/bashrc as part of their installation. ENH: relax prefix restrictions on foamCreateVideo (issue #904) - shift the implicit '.' to be part of the default prefix. This allows things like "-image myimages_00" to work as might be expected.
This commit is contained in:
@ -4,7 +4,7 @@
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
||||
# \\/ M anipulation |
|
||||
# \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd.
|
||||
#-------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM.
|
||||
@ -45,7 +45,6 @@
|
||||
#
|
||||
# WM_PROJECT_DIR, WM_PROJECT and WM_PROJECT_VERSION will have been set
|
||||
# before calling this routine.
|
||||
# FOAM_INST_DIR may possibly have been set (to find installation)
|
||||
#
|
||||
#-------------------------------------------------------------------------------
|
||||
Script=${0##*/}
|
||||
@ -90,7 +89,7 @@ esac
|
||||
# Check ~/.$WM_PROJECT/$WM_PROJECT_VERSION/
|
||||
# Check ~/.$WM_PROJECT/
|
||||
# Check <installedProject>/etc/
|
||||
if [ "$WM_PROJECT" ]
|
||||
if [ -n "$WM_PROJECT" ]
|
||||
then
|
||||
for i in \
|
||||
$HOME/.$WM_PROJECT/$WM_PROJECT_VERSION \
|
||||
@ -108,20 +107,13 @@ fi
|
||||
|
||||
# Construct test string for remote execution.
|
||||
# Source WM_PROJECT settings if WM_PROJECT environment not set.
|
||||
# Attempt to preserve the installation directory 'FOAM_INST_DIR'
|
||||
# Use FOAM_SETTINGS to pass command-line settings
|
||||
case $sourceFoam in
|
||||
case "$sourceFoam" in
|
||||
*/bashrc)
|
||||
if [ "$FOAM_INST_DIR" ]
|
||||
then
|
||||
sourceFoam='[ "$WM_PROJECT" ] || '"FOAM_INST_DIR=$FOAM_INST_DIR . $sourceFoam $FOAM_SETTINGS"
|
||||
else
|
||||
sourceFoam='[ "$WM_PROJECT" ] || '". $sourceFoam $FOAM_SETTINGS"
|
||||
fi
|
||||
sourceFoam='[ -n "$WM_PROJECT" ] || '". $sourceFoam $FOAM_SETTINGS"
|
||||
;;
|
||||
|
||||
*/cshrc)
|
||||
# TODO: csh equivalent to bash code (preserving FOAM_INST_DIR)
|
||||
sourceFoam='if ( ! $?WM_PROJECT ) source '"$sourceFoam $FOAM_SETTINGS"
|
||||
;;
|
||||
esac
|
||||
|
||||
Reference in New Issue
Block a user