Commit 6f2dd09f authored by Marco Clemencic's avatar Marco Clemencic
Browse files

Merge branch 'csh_fixes' into 'master'

csh fixes

See merge request !4
parents a078ad64 e9aec342
Pipeline #741843 passed with stages
in 1 minute and 32 seconds
......@@ -21,10 +21,11 @@ else
endif
if ( -e "${_home_dir}" && ! -e "${_home_dir}/.nogrouplogin" ) then
# customization enabled
foreach _f ( %target_dir%/etc/cern_profile.d/*.csh )
source ${_f}
endforeach
if ( -d %target_dir%/etc/cern_profile.d ) then
foreach _f ( `ls %target_dir%/etc/cern_profile.d/ | grep '\.csh$'` )
source %target_dir%/etc/cern_profile.d/${_f}
end
endif
if ( ! -e "${_home_dir}/.nolbenv" ) then
# LbEnv enabled
# - check the requested flavour
......
......@@ -18,18 +18,18 @@ setenv LHCBNIGHTLIES /cvmfs/lhcbdev.cern.ch/nightlies
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
else if ( -d /cvmfs/lhcb.cern.ch/etc/grid-security/certificates ) then
setenv X509_CERT_DIR /cvmfs/lhcb.cern.ch/etc/grid-security/certificates
fi
fi
endif
endif
if ( ! $?X509_VOMS_DIR ) then
if ( -d /etc/grid-security/vomsdir ) then
setenv X509_VOMS_DIR /etc/grid-security/vomsdir
elif ( -d /cvmfs/lhcb.cern.ch/etc/grid-security/vomsdir ) then
else if ( -d /cvmfs/lhcb.cern.ch/etc/grid-security/vomsdir ) then
setenv X509_VOMS_DIR /cvmfs/lhcb.cern.ch/etc/grid-security/vomsdir
fi
fi
endif
endif
# Variable to access the LHCb CASTOR instance
setenv STAGE_HOST castorlhcb.cern.ch
......
......@@ -32,9 +32,11 @@
_home_dir="${TEST_HOME:-${HOME}}"
if [ -e "${_home_dir}" -a ! \( -e "${_home_dir}/.nogrouplogin" \) ] ; then
# customization enabled
for _f in %target_dir%/etc/cern_profile.d/*.sh ; do
source ${_f}
done
if [ -d %target_dir%/etc/cern_profile.d ] ; then
for _f in $(ls %target_dir%/etc/cern_profile.d/ | grep '\.sh$') ; do
source %target_dir%/etc/cern_profile.d/${_f}
done
fi
if [ ! -e "${_home_dir}/.nolbenv" ] ; then
# LbEnv enabled
......
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