Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
LHCb Core Software
LbEnvBootstrap
Commits
a078ad64
Commit
a078ad64
authored
Mar 05, 2019
by
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
Changes
2
Pipelines
2
Show whitespace changes
Inline
Side-by-side
data/etc/cern_profile.csh
View file @
a078ad64
...
@@ -51,7 +51,7 @@ if ( -e "${_home_dir}" && ! -e "${_home_dir}/.nogrouplogin" ) then
...
@@ -51,7 +51,7 @@ if ( -e "${_home_dir}" && ! -e "${_home_dir}/.nogrouplogin" ) then
endif
endif
if ( "$_lbenv_flavour" == stable ) then
if ( "$_lbenv_flavour" == stable ) then
# for the time being "stable" means LbLogin
# 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
if ( $?prompt ) then
# interactive shell: print banner
# interactive shell: print banner
source %target_dir%/lhcb/LBSCRIPTS/prod/InstallArea/scripts/LbLogin.csh
source %target_dir%/lhcb/LBSCRIPTS/prod/InstallArea/scripts/LbLogin.csh
...
@@ -60,7 +60,7 @@ if ( -e "${_home_dir}" && ! -e "${_home_dir}/.nogrouplogin" ) then
...
@@ -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
source %target_dir%/lhcb/LBSCRIPTS/prod/InstallArea/scripts/LbLogin.csh >&/dev/null
endif
endif
setenv LBLOGIN_SOURCED 1
setenv LBLOGIN_SOURCED 1
f
i
endi
f
else
else
# source the LbEnv main script
# source the LbEnv main script
if ( -e %target_dir%/LbEnv-${_lbenv_flavour}.csh ) then
if ( -e %target_dir%/LbEnv-${_lbenv_flavour}.csh ) then
...
...
data/etc/cern_profile.d/cern_env.csh
View file @
a078ad64
...
@@ -15,7 +15,7 @@ setenv LHCBDOC /eos/project/l/lhcbwebsites/www/projects
...
@@ -15,7 +15,7 @@ setenv LHCBDOC /eos/project/l/lhcbwebsites/www/projects
setenv LHCBNIGHTLIES /cvmfs/lhcbdev.cern.ch/nightlies
setenv LHCBNIGHTLIES /cvmfs/lhcbdev.cern.ch/nightlies
# For grid usage
# For grid usage
if ( !
-n
$?X509_CERT_DIR ) then
if ( ! $?X509_CERT_DIR ) then
if ( -d /etc/grid-security/certificates ) then
if ( -d /etc/grid-security/certificates ) then
setenv X509_CERT_DIR /etc/grid-security/certificates
setenv X509_CERT_DIR /etc/grid-security/certificates
elif ( -d /cvmfs/lhcb.cern.ch/etc/grid-security/certificates ) then
elif ( -d /cvmfs/lhcb.cern.ch/etc/grid-security/certificates ) then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment