zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: command-args overload ignored for etc/config.csh/paraview

Browse Source 
- now needs local 'set' instead of 'setenv'

- fixed inconsistency in edit of ParaView_VERSION for csh version
This commit is contained in:
Mark Olesen
2018-12-10 09:50:46 +01:00
parent 69006ef0a7
commit 38c56c5c6b
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/tools/foamConfigurePaths
View File

@ -123,7 +123,7 @@ _matches()
local result local result
for regexp for regexp
do do
result=$(echo "$input" | sed -n -e "/^$regexp"'$/p') result=$(echo "$input" | sed -ne "/^$regexp"'$/p')
test -n "$result" && return 0 # successful match test -n "$result" && return 0 # successful match
done done
return 1 return 1
@ -243,7 +243,7 @@ removeBashMagic()
# ---- # ----
# set projectName="$WM_PROJECT" # set projectName="$WM_PROJECT"
# set projectDir=`lsof +p $$ |& \ # set projectDir=`lsof +p $$ |& \
# sed -n -e 's@^[^/]*@@; s@\(/'"$projectName"'[^/]*\)/etc/cshrc[^/]*@\1@p'` # sed -ne 'something /etc/cshrc something'`
# ---- # ----
removeCshMagic() removeCshMagic()
{ {
@ -586,8 +586,8 @@ do
_matches "$optionValue" "$expected" || \ _matches "$optionValue" "$expected" || \
die "'$1' has bad value: '$optionValue'" die "'$1' has bad value: '$optionValue'"
replace etc/config.sh/paraview ParaView_VERSION "$optionValue" replace etc/config.sh/paraview ParaView_VERSION "$optionValue"
replaceCsh etc/config.csh/paraview ParaView_VERSION "$optionValue" replace etc/config.csh/paraview ParaView_VERSION "$optionValue"
adjusted=true adjusted=true
shift shift
;; ;;

9
etc/config.csh/paraview
View File

@ -77,15 +77,14 @@ endif
while ( $#argv > 0 ) while ( $#argv > 0 )
switch ($argv[1]) switch ($argv[1])
case ParaView*=*: case ParaView*=*:
# name=value -> setenv name value # name=value -> set name=value
eval "setenv $argv[1]:s/=/ /" eval "set $argv[1]"
breaksw breaksw
endsw endsw
shift shift
end end
if (! $?ParaView_VERSION ) set ParaView_VERSION='' if ($?ParaView_VERSION) then
switch ("$ParaView_VERSION") switch ("$ParaView_VERSION")
case "": case "":
# empty - do nothing # empty - do nothing
@ -209,8 +208,8 @@ default:
setenv ParaView_DIR # Defined but empty (used by foamPV alias) setenv ParaView_DIR # Defined but empty (used by foamPV alias)
endif endif
breaksw breaksw
endsw endsw
endif
unset cleaned archDir unset cleaned archDir
unset cmake cmake_version unset cmake cmake_version