zsh: Make sure entries in $fpath are unique.

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index 1ae1ab87837cb7978fc3c604142118ee3f8b0923..0370fb00d8ddf720ae4949e05551af5ce9f044b2 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -32,6 +32,8 @@ setopt ignoreeof
 
 # FUNCTION SETTINGS
 
+# Make sure every entry in $fpath is unique.
+typeset -U fpath
 # Set correct fpath to allow loading my functions (including completion
 # functions).
 fpath=(~/.zsh/functions $fpath)
@@ -144,6 +146,10 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
     if [[ $? -eq 0 ]]; then
         window_stumpwm=yes
     fi
+    # Set to a non empty value when the shell is running as root.
+    if [[ $(id -u) -eq 0 ]]; then
+        window_root=yes
+    fi
 
     window_preexec() {
         # Get the program name with its arguments.
@@ -180,9 +186,10 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
                 ;;
         esac
 
-        # Add an exclamation mark at the beginning if running with sudo.
-        if [[ $program_sudo == yes ]]; then
-            program_sudo=!$program_sudo
+        # Add an exclamation mark at the beginning if running with sudo or if
+        # running zsh as root.
+        if [[ $program_sudo == yes || $window_root == yes ]]; then
+            program_name=!$program_name
         fi
 
         # Add an at mark at the beginning if running ssh on a different
@@ -205,6 +212,8 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
         # Reset the window name to 'zsh'.
         if [[ -n $SSH_CONNECTION ]]; then
             window_title "@zsh"
+        elif [[ $window_root == yes ]]; then
+            window_title "!zsh"
         else
             window_title "zsh"
         fi