]> git.madduck.net Git - etc/zsh.git/blobdiff - .zsh/zshrc/80_prompt

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

set warn_create_global and unglobal a few
[etc/zsh.git] / .zsh / zshrc / 80_prompt
index d42b76c114037bd47853c5acb1c295d201e26003..54d0e4d25b67e4dbd7166a364e69347bf2605451 100644 (file)
@@ -9,20 +9,16 @@
 #
 
 if [ "${PS1:-}" = '%m%# ' ]; then
 #
 
 if [ "${PS1:-}" = '%m%# ' ]; then
-  _MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)"
+  local _MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)"
   if is_root; then
     _MIDDLE="%25<..<%~%<<"
   if is_root; then
     _MIDDLE="%25<..<%~%<<"
-    _PS1_HL=U
+    local _PS1_HL=U
   fi
 
   fi
 
-  _MACHINE_NAME="${_PS1_HL:=B}%m%${(L)_PS1_HL}"
-  _MACHINE_NAME="$_MACHINE_NAME${debian_chroot:+/$debian_chroot}"
+  local _MACHINE_NAME="${_PS1_HL:=B}%m%${(L)_PS1_HL}"
+  _MACHINE_NAME="$_MACHINE_NAME${debian_chroot:+/%S$debian_chroot%s}"
 
   PS1="%(2L.+.)%${_MACHINE_NAME}:${_MIDDLE}%# "
 
   PS1="%(2L.+.)%${_MACHINE_NAME}:${_MIDDLE}%# "
-
-  unset _MACHINE_NAME
-  unset _PS1_HL
-  unset _MIDDLE
 fi
 
 : ${RPS1:="#%(0?..%?,)%!"}
 fi
 
 : ${RPS1:="#%(0?..%?,)%!"}