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:
Mark Olesen
2018-12-10 09:50:46 +01:00
parent 69006ef0a7
commit 38c56c5c6b
2 changed files with 8 additions and 9 deletions

View File

@ -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
;;