Make sure that WM_PROJECT_VERSION_ADDITION is unset at the start of the script
--HG-- branch : bgschaid/minorAdditionsBranch
This commit is contained in:
parent
194418bc0c
commit
a10196a180
2 changed files with 7 additions and 1 deletions
|
@ -32,6 +32,7 @@
|
||||||
#
|
#
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
unset WM_PROJECT_VERSION_ADDITION
|
||||||
prefSettingFile=$0.preset
|
prefSettingFile=$0.preset
|
||||||
if [ -f $prefSettingFile ]
|
if [ -f $prefSettingFile ]
|
||||||
then
|
then
|
||||||
|
|
|
@ -30,6 +30,11 @@
|
||||||
# Sourced from ~/.login or ~/.cshrc
|
# Sourced from ~/.login or ~/.cshrc
|
||||||
#
|
#
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# make sure that this variable is set un purpose
|
||||||
|
unset WM_PROJECT_VERSION_ADDITION
|
||||||
|
unsetenv WM_PROJECT_VERSION_ADDITION
|
||||||
|
|
||||||
set called=($_)
|
set called=($_)
|
||||||
set prefSettingFile=$called[2].preset
|
set prefSettingFile=$called[2].preset
|
||||||
|
|
||||||
|
@ -42,7 +47,7 @@ unset prefSettingFile,called
|
||||||
setenv WM_PROJECT OpenFOAM
|
setenv WM_PROJECT OpenFOAM
|
||||||
setenv WM_PROJECT_VERSION 1.6-ext
|
setenv WM_PROJECT_VERSION 1.6-ext
|
||||||
|
|
||||||
if ( "$WM_PROJECT_VERSION_ADDITION" != "" ) then
|
if ( $?WM_PROJECT_VERSION_ADDITION ) then
|
||||||
setenv WM_PROJECT_VERSION $WM_PROJECT_VERSION-$WM_PROJECT_VERSION_ADDITION
|
setenv WM_PROJECT_VERSION $WM_PROJECT_VERSION-$WM_PROJECT_VERSION_ADDITION
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Reference in a new issue