From 47ba3d046e94e7370ff6cc48649b77617b3ade96 Mon Sep 17 00:00:00 2001
From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Fri, 31 Jul 2015 15:30:40 +0100
Subject: [PATCH] profile

---
 etc/profile             | 13 +++++++------
 etc/profile.d/functions |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/etc/profile b/etc/profile
index 89ddc1c4..8a534afc 100644
--- 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 019fbb30..5ca4a17d 100644
--- 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
 
-- 
2.47.3