diff options
| -rw-r--r-- | plugins/capistrano/_capistrano | 2 | ||||
| -rw-r--r-- | themes/amuse.zsh-theme | 3 | ||||
| -rw-r--r-- | themes/emotty.zsh-theme | 6 | ||||
| -rwxr-xr-x | tools/install.sh | 5 | ||||
| -rw-r--r-- | tools/upgrade.sh | 5 |
5 files changed, 14 insertions, 7 deletions
diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano index e6e71ffcc..c19c20b7a 100644 --- a/plugins/capistrano/_capistrano +++ b/plugins/capistrano/_capistrano @@ -14,7 +14,7 @@ _arguments -C \ _cap_tasks() { if [[ -f config/deploy.rb || -f Capfile ]]; then if [[ ! -f .cap_tasks~ ]]; then - shipit -v --tasks | sed 's/\(\[\)\(.*\)\(\]\)/\2:/' | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~ + shipit --tasks | sed 's/\(\[\)\(.*\)\(\]\)/\2:/' | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~ fi OLD_IFS=$IFS diff --git a/themes/amuse.zsh-theme b/themes/amuse.zsh-theme index 60761b5c0..c1314e8b1 100644 --- a/themes/amuse.zsh-theme +++ b/themes/amuse.zsh-theme @@ -12,7 +12,8 @@ PROMPT=' %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) ⌚ %{$fg_bold[red]%}%*%{$reset_color%} $ ' -ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}⭠ " +# Must use Powerline font, for \uE0A0 to render. +ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}\uE0A0 " ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!" ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?" diff --git a/themes/emotty.zsh-theme b/themes/emotty.zsh-theme index f646b2fa8..34d491ff0 100644 --- a/themes/emotty.zsh-theme +++ b/themes/emotty.zsh-theme @@ -51,7 +51,7 @@ root_prompt="$emoji[skull]" warn_prompt="$emoji[collision_symbol]" vcs_unstaged_glyph="%{$emoji[circled_latin_capital_letter_m]$emoji2[emoji_style] %2G%}" -vcs_staged_glyph="%{$emoji[high_voltage_sign] %1G%}" +vcs_staged_glyph="%{$emoji[high_voltage_sign] %2G%}" vcs_branch_glyph=$(print -P $'\Ue0a0') # vcs_action_glyph=$(print -P $'\U276f') # ❯ @@ -60,7 +60,7 @@ yellow="$FG[003]" green="$FG[002]" cyan="$FG[014]" -prompt_glyph="%{%(#.${root_prompt}.${user_prompt})%1G%}" +prompt_glyph="%{%(#.${root_prompt}.${user_prompt}) %2G%}" # Uncomment the next line if you also like to see the warn_prompt in the prompt on the right. #last_command_failed="%(?.. %F{red}%1{${warn_prompt} %1G%}%?%f)" @@ -80,7 +80,7 @@ zstyle ':vcs_info:*' stagedstr "${green}${vcs_staged_glyph}" # %(K|F){color} set (back|fore)ground color # %(k|f) reset (back|fore)ground color zstyle ':vcs_info:*' max-exports 3 -zstyle ':vcs_info:*' nvcsformats "${prompt_glyph} " '%3~' '' +zstyle ':vcs_info:*' nvcsformats "${prompt_glyph}" '%3~' '' zstyle ':vcs_info:*' formats "${yellow}%u%c%b${vcs_branch_glyph}%f" '%S|' "$FX[bold]%r$FX[no-bold]" zstyle ':vcs_info:*' actionformats "${red}%K{white}%a${vcs_action_glyph}%k%f" '%S|' "$FX[bold]%r$FX[no-bold]" diff --git a/tools/install.sh b/tools/install.sh index 4b1a6ba7e..30d66d4b5 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -2,7 +2,10 @@ set -e # Use colors, but only if connected to a terminal, and that terminal # supports them. -ncolors=$(tput colors) +tput=$(which tput) +if [ -n "$tput" ]; then + ncolors=$($tput colors) +fi if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then RED="$(tput setaf 1)" GREEN="$(tput setaf 2)" diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 65af6e368..6e9696202 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -1,7 +1,10 @@ # Use colors, but only if connected to a terminal, and that terminal # supports them. -ncolors=$(tput colors) +tput=$(which tput) +if [ -n "$tput" ]; then + ncolors=$(tput colors) +fi if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then RED="$(tput setaf 1)" GREEN="$(tput setaf 2)" |