Commit 87d382f6 authored by Ben Couturier's avatar Ben Couturier
Browse files

Merge branch '3-change-the-default-user-environment-to-lbenv' into 'master'

Resolve "Change the default user environment to LbEnv"

Closes #3

See merge request !16
parents 18ff2a2d 7a925a7a
Pipeline #1623591 passed with stages
in 1 minute and 59 seconds
......@@ -18,9 +18,6 @@ It is meant to be the main entry point (for HEPIX), and delegate to the files
in `cern_profile.d` for the basic environment, and to `LbEnv-flavour.sh` for
the rest.
*Note*: While commissioning these new scripts, the flavour _stable_ actually
uses the _prod_ version of `LbLogin` rather than `LbEnv-stable.`
The user can control the behaviour of the script by means of special files
in the home directory:
- `.nogrouplogin`: if present, completely disable customization
......
......@@ -51,10 +51,6 @@ if ( -e "${_home_dir}" && ! -e "${_home_dir}/.nogrouplogin" ) then
breaksw
endsw
endif
# for the time being "stable" means LbLogin
if ( "$_lbenv_flavour" == stable ) then
set _lbenv_flavour=legacy
endif
if ( "$_lbenv_flavour" == legacy ) then
if ( ! $?LBLOGIN_SOURCED && -e %target_dir%/lhcb/LBSCRIPTS/prod/InstallArea/scripts/LbLogin.csh ) then
if ( $?prompt ) then
......
......@@ -58,10 +58,6 @@ if [ -e "${_home_dir}" -a ! \( -e "${_home_dir}/.nogrouplogin" \) ] ; then
*) _lbenv_flavour=stable ;; # anything else maps to stable
esac
fi
# for the time being "stable" means LbLogin
if [ "${_lbenv_flavour}" = stable ] ; then
_lbenv_flavour=legacy
fi
if [ "${_lbenv_flavour}" = legacy ] ; then
if [ -z "$LBLOGIN_SOURCED" -a -e ${OVERRIDE_MYSITEROOT:-%target_dir%}/lhcb/LBSCRIPTS/prod/InstallArea/scripts/LbLogin.sh ] ; then
if [[ $- == *i* ]] ; 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