Merge remote-tracking branch 'robbyrussell/master'

* robbyrussell/master: (75 commits)
  Update custom location command and fix code format
  Fix typo.
  Fix backwards logic in uninstaller once and for all
  Refactor for method in plugins/rake-fast/rake-fast.plugin.zsh
  Fix conditional in uninstall prompt
  Fix syntax error in confirmation prompt of uninstall.sh
  Fix syntax error in #4515 on certain shells
  Revert "Make install script safer"
  Fix "be" -> "b" typo in coffee plugin README.md.
  Make install script safer
  [FIX #4525]: Fix typo
  Fixd bug for pyenv plugin
  Fix install.sh/upgrade.sh for tput-less systems
  Check for git before trying to upgrade, as per #4504
  Enable pyenv rehash
  Init pyenv virtualenvs too
  Add option '--port' to 'rails server' alias.
  Add an alias for upstream
  autoenv: actually source autoenv once located
  add alias to sort by version
  ...
This commit is contained in:
Carlos Cardoso 2015-10-24 00:32:02 -04:00
commit 049724070a
45 changed files with 521 additions and 275 deletions

View file

@ -12,14 +12,15 @@ 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]%}?"
ZSH_THEME_GIT_PROMPT_CLEAN=""
if [ -e ~/.rvm/bin/rvm-prompt ]; then
RPROMPT='%{$fg_bold[red]%}$(~/.rvm/bin/rvm-prompt i v)%{$reset_color%}'
RPROMPT='%{$fg_bold[red]%}$(rvm_current)%{$reset_color%}'
else
if which rbenv &> /dev/null; then
RPROMPT='%{$fg_bold[red]%}$(rbenv_version)%{$reset_color%}'