deb08a762e4ec8b16ddce088047a4accc461e6c7

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge conflicts with af-magic theme

Diff

 1diff --git a/lib/prompt_info_functions.zsh b/lib/prompt_info_functions.zsh
 2new file mode 100644
 3index 0000000000000000000000000000000000000000..335c02a3d03867efa8674d778189d82a377896c6
 4--- /dev/null
 5+++ b/lib/prompt_info_functions.zsh
 6@@ -0,0 +1,33 @@
 7+# *_prompt_info functions for usage in your prompt
 8+#
 9+# Plugin creators, please add your *_prompt_info function to the list
10+# of dummy implementations to help theme creators not receiving errors
11+# without the need of implementing conditional clauses.
12+#
13+# See also lib/bzr.zsh, lib/git.zsh and lib/nvm.zsh for
14+# git_prompt_info, bzr_prompt_info and nvm_prompt_info
15+
16+# Dummy implementations that return false to prevent command_not_found
17+# errors with themes, that implement these functions
18+# Real implementations will be used when the respective plugins are loaded
19+function chruby_prompt_info hg_prompt_info pyenv_prompt_info \
20+  rbenv_prompt_info svn_prompt_info vi_mode_prompt_info \
21+  virtualenv_prompt_info {
22+  return 1
23+}
24+
25+# oh-my-zsh supports an rvm prompt by default
26+# get the name of the rvm ruby version
27+function rvm_prompt_info() {
28+  [ -f $HOME/.rvm/bin/rvm-prompt ] || return 1
29+  local rvm_prompt
30+  rvm_prompt=$($HOME/.rvm/bin/rvm-prompt ${=ZSH_THEME_RVM_PROMPT_OPTIONS} 2>/dev/null)
31+  [[ "${rvm_prompt}x" == "x" ]] && return 1
32+  echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
33+}
34+
35+# use this to enable users to see their ruby version, no matter which
36+# version management system they use
37+function ruby_prompt_info() {
38+  echo $(rvm_prompt_info || rbenv_prompt_info || chruby_prompt_info)
39+}
40diff --git a/lib/rbenv.zsh b/lib/rbenv.zsh
41deleted file mode 100644
42index a8b6c323ccae4f9bbe3f4955e258b88463b14e60..0000000000000000000000000000000000000000
43--- a/lib/rbenv.zsh
44+++ /dev/null
45@@ -1,2 +0,0 @@
46-# using the rbenv plugin will override this with a real implementation
47-function rbenv_prompt_info() {}
48diff --git a/lib/rvm.zsh b/lib/rvm.zsh
49deleted file mode 100644
50index e8744e61e373799201c3d55f4777f47be8728135..0000000000000000000000000000000000000000
51--- a/lib/rvm.zsh
52+++ /dev/null
53@@ -1,8 +0,0 @@
54-# get the name of the ruby version
55-function rvm_prompt_info() {
56-  [ -f $HOME/.rvm/bin/rvm-prompt ] || return
57-  local rvm_prompt
58-  rvm_prompt=$($HOME/.rvm/bin/rvm-prompt ${ZSH_THEME_RVM_PROMPT_OPTIONS} 2>/dev/null)
59-  [[ "${rvm_prompt}x" == "x" ]] && return
60-  echo "${ZSH_THEME_RVM_PROMPT_PREFIX:=(}${rvm_prompt}${ZSH_THEME_RVM_PROMPT_SUFFIX:=)}"
61-}