From b70a703a09627e6d96fe9184e9a40395b625a0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 20 Aug 2018 18:15:49 +0200
Subject: [PATCH] trapd00r: clean up the script

---
 themes/trapd00r.zsh-theme | 68 ++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 37 deletions(-)

diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r.zsh-theme
index 7c36487b3..144d2549a 100755
--- a/themes/trapd00r.zsh-theme
+++ b/themes/trapd00r.zsh-theme
@@ -1,8 +1,8 @@
 # trapd00r.zsh-theme
 #
 # This theme needs a terminal supporting 256 colors as well as unicode.
-# In order to avoid external dependencies, it also embeds a (possibly old)
-# copy of the perl script located at https://github.com/trapd00r/utils/blob/master/zsh_path,
+# In order to avoid external dependencies, it also has a zsh version of
+# the perl script at https://github.com/trapd00r/utils/blob/master/zsh_path,
 # which splits up the current path and makes it fancy.
 #
 # By default it spans over two lines like so:
@@ -21,20 +21,20 @@
 autoload -U add-zsh-hook
 autoload -Uz vcs_info
 
-local c0=$( printf "\e[m")
-local c1=$( printf "\e[38;5;245m")
-local c2=$( printf "\e[38;5;250m")
-local c3=$( printf "\e[38;5;242m")
-local c4=$( printf "\e[38;5;197m")
-local c5=$( printf "\e[38;5;225m")
-local c6=$( printf "\e[38;5;240m")
-local c7=$( printf "\e[38;5;242m")
-local c8=$( printf "\e[38;5;244m")
-local c9=$( printf "\e[38;5;162m")
-local c10=$(printf "\e[1m")
-local c11=$(printf "\e[38;5;208m\e[1m")
-local c12=$(printf "\e[38;5;142m\e[1m")
-local c13=$(printf "\e[38;5;196m\e[1m")
+local c0=$'\e[m'
+local c1=$'\e[38;5;245m'
+local c2=$'\e[38;5;250m'
+local c3=$'\e[38;5;242m'
+local c4=$'\e[38;5;197m'
+local c5=$'\e[38;5;225m'
+local c6=$'\e[38;5;240m'
+local c7=$'\e[38;5;242m'
+local c8=$'\e[38;5;244m'
+local c9=$'\e[38;5;162m'
+local c10=$'\e[1m'
+local c11=$'\e[38;5;208m\e[1m'
+local c12=$'\e[38;5;142m\e[1m'
+local c13=$'\e[38;5;196m\e[1m'
 
 
 zsh_path() {
@@ -79,20 +79,19 @@ zsh_path() {
 
 
 # We don't want to use the extended colorset in the TTY / VC.
-if [ "$TERM" = "linux" ]; then
-    c1=$( printf "\e[34;1m")
-    c2=$( printf "\e[35m")
-    c3=$( printf "\e[31m")
-    c4=$( printf "\e[31;1m")
-    c5=$( printf "\e[32m")
-    c6=$( printf "\e[32;1m")
-    c7=$( printf "\e[33m")
-    c8=$( printf "\e[33;1m")
-    c9=$( printf "\e[34m")
-
-    c11=$(printf "\e[35;1m")
-    c12=$(printf "\e[36m")
-    c13=$(printf "\e[31;1m")
+if [ "$TERM" = linux ]; then
+  c1=$'\e[34;1m'
+  c2=$'\e[35m'
+  c3=$'\e[31m'
+  c4=$'\e[31;1m'
+  c5=$'\e[32m'
+  c6=$'\e[32;1m'
+  c7=$'\e[33m'
+  c8=$'\e[33;1m'
+  c9=$'\e[34m'
+  c11=$'\e[35;1m'
+  c12=$'\e[36m'
+  c13=$'\e[31;1m'
 fi
 
 zstyle ':vcs_info:*' actionformats \
@@ -112,14 +111,12 @@ prompt_jnrowe_precmd () {
     dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
     PROMPT='%{$fg_bold[green]%}%p%{$reset_color%}${vcs_info_msg_0_}${dir_status} ${ret_status}%{$reset_color%}
 > '
-
-# modified, to be committed
+  # modified, to be committed
   elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then
     dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
     PROMPT='${vcs_info_msg_0_}%{$30%} %{$bg_bold[red]%}%{$fg_bold[cyan]%}C%{$fg_bold[black]%}OMMIT%{$reset_color%}
 %{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
 > '
-
   elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then
     dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
     PROMPT='${vcs_info_msg_0_}%{$bg_bold[red]%}%{$fg_bold[blue]%}D%{$fg_bold[black]%}IRTY%{$reset_color%}
@@ -130,8 +127,5 @@ prompt_jnrowe_precmd () {
     PROMPT='${vcs_info_msg_0_}
 %{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
 > '
-fi
+  fi
 }
-
-
-#  vim: set ft=zsh sw=2 et tw=0: