move shell setup outside of profile.d

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
 

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

containers/jug/profile.d/a00_setup.sh → 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