profile

diff --git a/etc/profile b/etc/profile
index 89ddc1c416522f342daa5f34f6caa461979e2e16..8a534afc0bdd783bd83b13b48aaa424c4b6cad3a 100644 (file)
--- a/etc/profile
+++ b/etc/profile
@@ -8,12 +8,13 @@ unset path
 
 if [ -z "$NB_ROOT" ]; then
   unset NB_ROOT
-  return
-fi
 
-for i in ${NB_ROOT}/etc/profile.d/envs ${NB_ROOT}/etc/profile.d/aliases $NB_ROOT/etc/profile.d/*.sh; do
-  [ -r "$i" ] && . "$i"
-done
+else
+  for i in ${NB_ROOT}/etc/profile.d/envs ${NB_ROOT}/etc/profile.d/aliases $NB_ROOT/etc/profile.d/*.sh; do
+    [ -r "$i" ] && . "$i"
+  done
+  unset i tmp
+
+fi
 
-unset i tmp
 true

diff --git a/etc/profile.d/functions b/etc/profile.d/functions
index 019fbb30f4dd14aa1fbc0fa1f6d23afbc40d8b4a..5ca4a17d327a803fd91792dd361de1589bef6078 100644 (file)
--- a/etc/profile.d/functions
+++ b/etc/profile.d/functions
@@ -51,7 +51,7 @@ shell_slogin() {
   (
     alias
     type $(shell_functions) | grep -v 'is a function$'
-    cat $NB_ROOT/etc/profile
+    #cat $NB_ROOT/etc/profile
     echo "[ -r /etc/profile ] && . /etc/profile"
   ) | ssh "$server" "cat > $tmp || rm -vf $tmp" || return