diff --git a/containers/jug/Dockerfile.dev b/containers/jug/Dockerfile.dev index a56e3d9409d6fd071d6b3ff6ab1bc3f5c47dbf51..f143f2ed30f580b4687f27a2c9712816a3ac5cb3 100644 --- a/containers/jug/Dockerfile.dev +++ b/containers/jug/Dockerfile.dev @@ -194,7 +194,7 @@ COPY eic-shell /usr/local/bin/eic-shell COPY eic-info /usr/local/bin/eic-info COPY entrypoint.sh /usr/local/sbin/entrypoint.sh COPY eic-env.sh /etc/eic-env.sh -COPY profile.d/a00_setup.sh /etc/profile.d +COPY profile.d/a00_cleanup.sh /etc/profile.d COPY profile.d/z11_jug_env.sh /etc/profile.d COPY singularity.d /.singularity.d diff --git a/containers/jug/eic-env.sh b/containers/jug/eic-env.sh index c540db1db5a945dcfad7e9309c8c7509b2d803d8..28d42a50d8c2e01ea70512d64f0358612110ca51 100755 --- a/containers/jug/eic-env.sh +++ b/containers/jug/eic-env.sh @@ -3,3 +3,16 @@ for i in /etc/profile.d/*.sh; do source $i done + +export PS1='eic-shell> \[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' +export LS_COLORS='rs=0:di=01;34:ln=01;36:mh=00:pi=40;33' +export GREP_OPTIONS='--color=auto' + +function ls { + /bin/ls --color=auto + } +function less { + /usr/bin/less -RAW_CONTROL_CHARS + } +export -f ls +export -f less diff --git a/containers/jug/profile.d/a00_setup.sh b/containers/jug/profile.d/a00_cleanup.sh similarity index 68% rename from containers/jug/profile.d/a00_setup.sh rename to containers/jug/profile.d/a00_cleanup.sh index eec128f83dae3d34eaa82501bfcf07d84916bcf8..529ae7269f047f70f44acd57ec2dcfb214d8ac40 100755 --- a/containers/jug/profile.d/a00_setup.sh +++ b/containers/jug/profile.d/a00_cleanup.sh @@ -14,16 +14,3 @@ export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin [ ! -z "$CMAKE_PREFIX_PATH" ] && unset CMAKE_PREFIX_PATH [ ! -z "$SOFTWARE_HOME" ] && unset SOFTWARE_HOME [ ! -z "$ROOTSYS" ] && unset ROOTSYS - -export PS1='eic-shell> \[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' -export LS_COLORS='rs=0:di=01;34:ln=01;36:mh=00:pi=40;33' -export GREP_OPTIONS='--color=auto' - -function ls { - /bin/ls --color=auto - } -function less { - /usr/bin/less -RAW_CONTROL_CHARS - } -export -f ls -export -f less