]> 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:

projects / etc / zsh.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
output short listing as context
[etc/zsh.git] / .zsh / zshrc / 80_prompt
diff --git a/.zsh/zshrc/80_prompt b/.zsh/zshrc/80_prompt
index cdde4daa6797c1f51aaddf5c3ffcfdabd47ec3fb..d687dd6086888cc006742acd60887683a1873171 100644 (file)
--- a/.zsh/zshrc/80_prompt
+++ b/.zsh/zshrc/80_prompt
@@ -1,22 +1,26 @@
-# zshrc/90_prompt
+# zshrc/80_prompt
 #
 # Formats the shell prompt
 #
 # Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #
-# Source repository: http://git.madduck.net/v/etc/zsh.git
+# Source repository: git://git.madduck.net/etc/zsh.git
 #
 
-_MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)"
-if is_root; then
-  _MIDDLE="%25<..<%~%<<"
-  _PS1_HL=U
+if [ "${PS1:-}" = '%m%# ' ]; then
+  local _MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)"
+  if is_root; then
+    _MIDDLE="%25<..<%~%<<"
+    local _PS1_HL=U
+  fi
+
+  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}%# "
 fi
-PS1="%${_PS1_HL:=B}%m%${(L)_PS1_HL}:${_MIDDLE}%# "
-unset _PS1_HL
-unset _MIDDLE
 
-RPS1="#%(0?..%?,)%!"
+: ${RPS1:="#%(0?..%?,)%!"}
 
 # vim:ft=zsh
zsh configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.