/opt/nb/etc/profile.d/envs

diff --git a/etc/profile.d/envs b/etc/profile.d/envs
index 071dab85c4a121ccc85b1353a83ab81943f35073..a5d255fdf3095bf9ecdb766dd6cd91a81a1f0f18 100644 (file)
--- a/etc/profile.d/envs
+++ b/etc/profile.d/envs
@@ -4,23 +4,56 @@
 #
 #################################################################################
 
-#
-# APP
-#
-[ -z "$CLOUD_DIR" ] && [ -e ~nico/Dropbox ] && CLOUD_DIR=~nico/Dropbox
-
 #
 # BASE
 #
-[ -z "$HOME" ] && HOME=`realpath ~/`
+[ -z "$HOME" ] && HOME=~
 [ -z "$HOSTNAME" ] && HOSTNAME=`hostname`
 [ -z "$UID" ] && UID=`id -u`
 [ -z "$USER" ] && USER=`whoami`
 [ -z "$OSTYPE" ] && OSTYPE=`uname|tr [:upper:] [:lower:]`
 
-# > env_add_path
+#
+# SHELL
+#
+case "$BASH" in
+  */sh) SHELL_NAME=sh ;;
+  */bash) SHELL_NAME=bash ;;
+  *)
+    if ls --help 2>&1 | /bin/grep -qm1 ^BusyBox; then
+      SHELL_NAME="busybox"
+    elif [ -n "$ZSH_NAME" ]; then
+      SHELL_NAME=zsh
+    fi
+  ;;
+esac
+export SHELL_NAME
+
+#
+# Color
+#
+color_prompt=no
+if is_prompt; then
+  case "$TERM" in
+    xterm-*color) color_prompt=yes;;
+    *screen*) color_prompt=yes;;
+    linux) color_prompt=yes;;
+  esac
+fi
+
+#
+# OTHERS
+#
+export IGNOREEOF=0
+case "$OSTYPE" in darwin*) export DARWIN=1;; esac
+export LESS="-iMR"
+export PAGER="less $LESS"
+export EDITOR=vim
+[ -z "$LC_ALL" -a -n "$LANG" ] && export LC_ALL="$LANG"
+
+# env_add_path
 # We don't want to destroyed variables if function does not exists !
-if true || env_add_path 1>/dev/null; then
+env_add_path 1>/dev/null || return
 
 #
 # PATH
@@ -60,44 +93,3 @@ AWKPATH=$(env_add_path "$AWKPATH" \
   $NB_ROOT/lib/awk
 )
 [ -n "$AWKPATH" ] && export AWKPATH
-
-fi # < env_add_path
-
-#
-# OTHERS
-#
-
-export IGNOREEOF=0
-case "$OSTYPE" in darwin*) export DARWIN=1;; esac
-export LESS="-iMR"
-export PAGER="less $LESS"
-export EDITOR=vim
-[ -z "$LC_ALL" -a -n "$LANG" ] && export LC_ALL="$LANG"
-
-#
-# SHELL
-#
-case "$BASH" in
-  */sh) SHELL_NAME=sh ;;
-  */bash) SHELL_NAME=bash ;;
-  *)
-    if ls --help 2>&1 | /bin/grep -qm1 ^BusyBox; then
-      SHELL_NAME="busybox"
-    elif [ -n "$ZSH_NAME" ]; then
-      SHELL_NAME=zsh
-    fi
-  ;;
-esac
-export SHELL_NAME
-
-#
-# Color
-#
-color_prompt=no
-if is_prompt; then
-  case "$TERM" in
-    xterm-*color) color_prompt=yes;;
-    *screen*) color_prompt=yes;;
-    linux) color_prompt=yes;;
-  esac
-fi