Commit a078ad64 authored by Ben Couturier's avatar Ben Couturier
Browse files

Merge branch 'fixes' into 'master'

Fix mistakes in tcsh version

See merge request !2
parents 4b289733 70837c59
Pipeline #737791 passed with stages
in 1 minute and 57 seconds
......@@ -51,7 +51,7 @@ if ( -e "${_home_dir}" && ! -e "${_home_dir}/.nogrouplogin" ) then
endif
if ( "$_lbenv_flavour" == stable ) then
# for the time being "stable" means LbLogin
if ( ! $?LBLOGIN_SOURCED && -e %target_dir%/lhcb/LBSCRIPTS/prod/InstallArea/scripts/LbLogin.csh ] ; then
if ( ! $?LBLOGIN_SOURCED && -e %target_dir%/lhcb/LBSCRIPTS/prod/InstallArea/scripts/LbLogin.csh ) then
if ( $?prompt ) then
# interactive shell: print banner
source %target_dir%/lhcb/LBSCRIPTS/prod/InstallArea/scripts/LbLogin.csh
......@@ -60,7 +60,7 @@ if ( -e "${_home_dir}" && ! -e "${_home_dir}/.nogrouplogin" ) then
source %target_dir%/lhcb/LBSCRIPTS/prod/InstallArea/scripts/LbLogin.csh >&/dev/null
endif
setenv LBLOGIN_SOURCED 1
fi
endif
else
# source the LbEnv main script
if ( -e %target_dir%/LbEnv-${_lbenv_flavour}.csh ) then
......
......@@ -15,7 +15,7 @@ setenv LHCBDOC /eos/project/l/lhcbwebsites/www/projects
setenv LHCBNIGHTLIES /cvmfs/lhcbdev.cern.ch/nightlies
# For grid usage
if ( ! -n $?X509_CERT_DIR ) then
if ( ! $?X509_CERT_DIR ) then
if ( -d /etc/grid-security/certificates ) then
setenv X509_CERT_DIR /etc/grid-security/certificates
elif ( -d /cvmfs/lhcb.cern.ch/etc/grid-security/certificates ) then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment