BUG: command-args overload ignored for etc/config.csh/paraview
- now needs local 'set' instead of 'setenv' - fixed inconsistency in edit of ParaView_VERSION for csh version
This commit is contained in:
parent
69006ef0a7
commit
38c56c5c6b
@ -123,7 +123,7 @@ _matches()
|
||||
local result
|
||||
for regexp
|
||||
do
|
||||
result=$(echo "$input" | sed -n -e "/^$regexp"'$/p')
|
||||
result=$(echo "$input" | sed -ne "/^$regexp"'$/p')
|
||||
test -n "$result" && return 0 # successful match
|
||||
done
|
||||
return 1
|
||||
@ -243,7 +243,7 @@ removeBashMagic()
|
||||
# ----
|
||||
# set projectName="$WM_PROJECT"
|
||||
# set projectDir=`lsof +p $$ |& \
|
||||
# sed -n -e 's@^[^/]*@@; s@\(/'"$projectName"'[^/]*\)/etc/cshrc[^/]*@\1@p'`
|
||||
# sed -ne 'something /etc/cshrc something'`
|
||||
# ----
|
||||
removeCshMagic()
|
||||
{
|
||||
@ -586,8 +586,8 @@ do
|
||||
_matches "$optionValue" "$expected" || \
|
||||
die "'$1' has bad value: '$optionValue'"
|
||||
|
||||
replace etc/config.sh/paraview ParaView_VERSION "$optionValue"
|
||||
replaceCsh etc/config.csh/paraview ParaView_VERSION "$optionValue"
|
||||
replace etc/config.sh/paraview ParaView_VERSION "$optionValue"
|
||||
replace etc/config.csh/paraview ParaView_VERSION "$optionValue"
|
||||
adjusted=true
|
||||
shift
|
||||
;;
|
||||
|
@ -77,15 +77,14 @@ endif
|
||||
while ( $#argv > 0 )
|
||||
switch ($argv[1])
|
||||
case ParaView*=*:
|
||||
# name=value -> setenv name value
|
||||
eval "setenv $argv[1]:s/=/ /"
|
||||
# name=value -> set name=value
|
||||
eval "set $argv[1]"
|
||||
breaksw
|
||||
endsw
|
||||
shift
|
||||
end
|
||||
|
||||
if (! $?ParaView_VERSION ) set ParaView_VERSION=''
|
||||
|
||||
if ($?ParaView_VERSION) then
|
||||
switch ("$ParaView_VERSION")
|
||||
case "":
|
||||
# empty - do nothing
|
||||
@ -209,8 +208,8 @@ default:
|
||||
setenv ParaView_DIR # Defined but empty (used by foamPV alias)
|
||||
endif
|
||||
breaksw
|
||||
|
||||
endsw
|
||||
endif
|
||||
|
||||
unset cleaned archDir
|
||||
unset cmake cmake_version
|
||||
|
Loading…
Reference in New Issue
Block a user