31a84e710f2006176402be6b76ce370dabfc95d3
- Author
- Marc Cornellà <marc.cornella@live.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
Merge pull request #5517 from mcornella/fix-suvash-theme
Display suvash prompt w/o Ruby; refactor code
Diff
1diff --git a/themes/suvash.zsh-theme b/themes/suvash.zsh-theme
2index c87f6455851df07b2659688761be347199244c97..1680973dfd8729a111b5f92cbc09c4a3e07e87e5 100644
3--- a/themes/suvash.zsh-theme
4+++ b/themes/suvash.zsh-theme
5@@ -5,26 +5,30 @@ function prompt_char {
6 }
7
8 function virtualenv_info {
9- [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
10+ [[ -n "$VIRTUAL_ENV" ]] && echo '('${VIRTUAL_ENV:t}') '
11 }
12
13-function collapse_pwd {
14- echo $(pwd | sed -e "s,^$HOME,~,")
15+function ruby_prompt {
16+ if (( $+commands[rvm-prompt] )); then
17+ print -n $ZSH_THEME_RUBY_PROMPT_PREFIX
18+ print -n $(~/.rvm/bin/rvm-prompt)
19+ print -n $ZSH_THEME_RUBY_PROMPT_SUFFIX
20+ elif (( $+commands[rbenv] )); then
21+ print -n $ZSH_THEME_RUBY_PROMPT_PREFIX
22+ print -n $(rbenv version | sed -e "s/ (set.*$//")
23+ print -n $ZSH_THEME_RUBY_PROMPT_SUFFIX
24+ fi
25+ return 0
26 }
27
28-if which rvm-prompt &> /dev/null; then
29- PROMPT='%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) using %{$reset_color%}%{$fg[red]%}$(~/.rvm/bin/rvm-prompt)%{$reset_color%}
30-$(virtualenv_info)$(prompt_char) '
31-else
32- if which rbenv &> /dev/null; then
33- PROMPT='%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) using %{$reset_color%}%{$fg[red]%}$(rbenv version | sed -e "s/ (set.*$//")%{$reset_color%}
34-$(virtualenv_info)$(prompt_char) '
35- fi
36-fi
37+PROMPT='%F{magenta}%n%f at %F{yellow}%m%f in %B%F{green}%~%f%b$(git_prompt_info)$(ruby_prompt)
38+$(virtualenv_info) $(prompt_char) '
39
40+ZSH_THEME_GIT_PROMPT_PREFIX=' on %F{magenta}'
41+ZSH_THEME_GIT_PROMPT_SUFFIX='%f'
42+ZSH_THEME_GIT_PROMPT_DIRTY='%F{green}!'
43+ZSH_THEME_GIT_PROMPT_UNTRACKED='%F{green}?'
44+ZSH_THEME_GIT_PROMPT_CLEAN=''
45
46-ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
47-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
48-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
49-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
50-ZSH_THEME_GIT_PROMPT_CLEAN=""
51+ZSH_THEME_RUBY_PROMPT_PREFIX=' using %F{red}'
52+ZSH_THEME_RUBY_PROMPT_SUFFIX='%f'