is_promt

diff --git a/etc/profile.d/envs b/etc/profile.d/envs
index 0e076cad6f48778c6863917cb828192310e76552..db1fcd579c3cf647d40ed1fc9ce11cbc07d24173 100644 (file)
--- a/etc/profile.d/envs
+++ b/etc/profile.d/envs
@@ -67,7 +67,9 @@ export EDITOR=vim
 case "$BASH" in
   */sh) SHELL_NAME=sh ;;
   */bash) SHELL_NAME=bash ;;
-  *) [ -n "$ZSH_NAME" ] && SHELL_NAME=zsh ;;
+  *)
+    [ -n "$ZSH_NAME" ] && SHELL_NAME=zsh
+  ;;
 esac
 export SHELL_NAME
 
@@ -75,49 +77,53 @@ export SHELL_NAME
 # Color
 #
 color_prompt=''
-case "$TERM" in
-       xterm-color) color_prompt=yes;;
-       *screen*) color_prompt=yes;;
-       linux) color_prompt=yes;;
-esac
+if is_prompt; then
+  case "$TERM" in
+    xterm-color) color_prompt=yes;;
+    *screen*) color_prompt=yes;;
+    linux) color_prompt=yes;;
+  esac
+fi
 
 #
 # PS1
 #
 
-case "$SHELL_NAME" in
-  bash)
-
-    h='\h'
-    color=''
-    #case $(tr '[:upper:]' '[:lower:]' <<<"$HOSTNAME") in
-    case "`hostname -f`" in
-      pi*) color=31 ;;
-      # ovh - yellow
-      *.ovh.net|*.kimsufi.com|*.ip-*.eu) color=33 ;;
-      # mac - magenta
-      Nicolas-Boisselier-MacBook*) h="macbook"; color=35 ;;
-      MacMini*) color=35 ;;
-      *.semantico.net|dev*|cst*|csp*|isp*) color=32 ;;
-      *) color=36 ;;
-    esac
-
-    char='$'; [ $UID = "0" ] && char='#'
-    if [ "$color_prompt" = yes -a -n "$color" ]; then
-      PS1="\[\033[01;${color}m\]\u@$h:\[\033[00m\]\W${char} "
-    else
-      PS1="\u@\h:\W${char} "
-    fi
-
-    unset h color char
-  ;;
-esac
+if is_prompt; then
+  case "$SHELL_NAME" in
+    bash)
+
+      h='\h'
+      color=''
+      char='$'; [ $UID = "0" ] && char='#'
+
+      case "`hostname -f`" in
+        pi*) color=31 ;;
+        # ovh - yellow
+        *.ovh.net|*.kimsufi.com|*.ip-*.eu) color=33 ;;
+        # mac - magenta
+        Nicolas-Boisselier-MacBook*) h="macbook"; color=35 ;;
+        MacMini*) color=35 ;;
+        *.semantico.net|dev*|cst*|csp*|isp*) color=32 ;;
+        *) color=36 ;;
+      esac
+
+      if [ "$color_prompt" = yes -a -n "$color" ]; then
+        PS1="\[\033[01;${color}m\]\u@$h:\[\033[00m\]\W${char} "
+      else
+        PS1="\u@\h:\W${char} "
+      fi
+
+      unset h color char
+    ;;
+  esac
+fi
 
 #
-# ls
+# Alias ls
 #
-ls_opt=''
-ll_opt=''
+ls_opt=' -F'
+ll_opt=' -alh'
 if [ -n "$DARWIN" ]; then
   [ "$color_prompt" = yes ] && ls_opt="$ls_opt -G"
 else
@@ -125,8 +131,8 @@ else
   ll_opt="$ll_opt --time-style=long-iso"
 fi
 
-[ "$ls_opt" = "" ] || alias ls="ls${ls_opt}"
-alias ll="ls -alh${ll_opt}"
+[ -n "$ls_opt" ] && alias ls="ls${ls_opt}"
+[ -n "$ll_opt" ] && alias ll="ls${ll_opt}"
 unset ls_opt ll_opt
 
 #

diff --git a/etc/profile.d/functions b/etc/profile.d/functions
index 90beb520e14d4259bf4ffc0f308891b62a9e85b6..2509a58bc29fb1c359a1b45b2fdb22eb8c473377 100644 (file)
--- a/etc/profile.d/functions
+++ b/etc/profile.d/functions
@@ -556,7 +556,7 @@ boot_loader() {
   return 0
 }
 
-is_shell() {
+is_prompt() {
   #[[ $- == *i* ]] && echo "Interactive" || echo "Not interactive"
   [[ $- == *i* ]] && return 0
   return 1