From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Mon, 23 Oct 2017 23:30:01 +0000 (+0100)
Subject: etc/profile.d/ps1.sh
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=143e3f9c80284499a8282a3ddea0251ab7638a05;p=nb.git

etc/profile.d/ps1.sh
---

diff --git a/etc/profile b/etc/profile
index e55d08f1..bf329ed5 100755
--- a/etc/profile
+++ b/etc/profile
@@ -32,7 +32,6 @@ unset NB_ETC_DIR
 #[ "${BASH-no}" != "no" ] && echo Is BASH
 #echo BASH_SOURCE=$BASH_SOURCE ZSH_VERSION=$ZSH_VERSION KSH_VERSION=$KSH_VERSION
 if [ -n "$BASH_SOURCE" ]; then
-  #NB_ETC_DIR="${BASH_SOURCE%/*}"
   NB_ETC_DIR="${BASH_SOURCE%/*}"
 
 elif [ -n "$ZSH_VERSION" ]; then
diff --git a/etc/profile.d/envs b/etc/profile.d/envs
index 9adfa80a..3d61f419 100644
--- a/etc/profile.d/envs
+++ b/etc/profile.d/envs
@@ -87,7 +87,7 @@ export SHELL_NAME
 #
 # Color
 #
-color_prompt=''
+color_prompt=no
 if is_prompt; then
   case "$TERM" in
     xterm-*color) color_prompt=yes;;
@@ -96,41 +96,6 @@ if is_prompt; then
   esac
 fi
 
-#
-# PS1
-#
-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*|Nicos-MacBook-Pro.local) color=32 ;;
-        *) color='' ;;
-      esac
-
-      if [ -n "$color" ]; then
-        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
-      fi
-
-      unset h color char
-    ;;
-  esac
-fi
-
 #
 # Alias ls
 #
@@ -166,4 +131,5 @@ fi
 #[ -n "$NB_DEBUG" ] && $NB_DEBUG "Color: $color_prompt, TERM=$TERM"
 [ -n "$NB_DEBUG" ] && [ -n "$color_prompt" ] && $NB_DEBUG "Color: $color_prompt"
 [ -n "$NB_DEBUG" ] && [ -n "$TERM" ] && $NB_DEBUG "TERM=$TERM"
-unset color_prompt
+
+# NB 24.10.17 unset color_prompt
diff --git a/etc/profile.d/ps1.sh b/etc/profile.d/ps1.sh
new file mode 100644
index 00000000..c1f5e718
--- /dev/null
+++ b/etc/profile.d/ps1.sh
@@ -0,0 +1,37 @@
+#
+# PS1
+#
+if is_prompt 2>/dev/null; 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*|Nicos-MacBook-Pro.local) color=32 ;;
+        *) color='' ;;
+      esac
+
+      if [ -n "$color" ]; then
+        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
+      fi
+
+      unset h color char
+    ;;
+  esac
+
+fi
+