`6756be7e5b0d41c3c4f047d8d9b9e2af9bb3cb0a`

Author: Peter Tillemans <pti@snamellit.com>
Committer: Peter Tillemans <pti@snamellit.com>
Date: 2012-07-16 15:29 UTC

Message

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

Diff

This diff is truncated to protect this page.

  1diff --git a/plugins/fasd/fasd.plugin.zsh b/plugins/fasd/fasd.plugin.zsh
  2new file mode 100644
  3index 0000000000000000000000000000000000000000..d42584f1a49b6236f2104fd8e54837e678a10a01
  4--- /dev/null
  5+++ b/plugins/fasd/fasd.plugin.zsh
  6@@ -0,0 +1,6 @@
  7+if [ $commands[fasd] ]; then # check if fasd is installed
  8+  eval "$(fasd --init auto)"
  9+  alias v='f -e vim'
 10+  alias o='a -e open'
 11+fi
 12+
 13diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh
 14index e455527e7617fb356c9e73dc5271f7c75bb71ff6..697f98d664f92b71ab9bed127cda0e42e5726d7c 100644
 15--- a/plugins/lol/lol.plugin.zsh
 16+++ b/plugins/lol/lol.plugin.zsh
 17@@ -29,7 +29,7 @@ alias iminurbase='finger'
 18 alias btw='nice'
 19 alias obtw='nohup'
 20 
 21-alias nomz='ps -aux'
 22+alias nomz='ps aux'
 23 alias nomnom='killall'
 24 
 25 alias byes='exit'
 26diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
 27index a62dd560209e7a63b782e3043e4300bbbd07a252..d855c244552ebd6e2b418108c0d3cce1f8fa7202 100644
 28--- a/plugins/rbenv/rbenv.plugin.zsh
 29+++ b/plugins/rbenv/rbenv.plugin.zsh
 30@@ -17,7 +17,7 @@ for rbenvdir in "${rbenvdirs[@]}" ; do
 31     FOUND_RBENV=1
 32     export RBENV_ROOT=$rbenvdir
 33     export PATH=${rbenvdir}/bin:$PATH
 34-    eval "$(rbenv init -)"
 35+    eval "$(rbenv init - zsh)"
 36 
 37     alias rubies="rbenv versions"
 38     alias gemsets="rbenv gemset list"
 39diff --git a/plugins/rbfu/rbfu.plugin.zsh b/plugins/rbfu/rbfu.plugin.zsh
 40new file mode 100644
 41index 0000000000000000000000000000000000000000..0084852054d3c78856b24187a2e485d02b5e04c8
 42--- /dev/null
 43+++ b/plugins/rbfu/rbfu.plugin.zsh
 44@@ -0,0 +1,42 @@
 45+# Enables rbfu with --auto option, if available.
 46+#
 47+# Also provides a command to list all installed/available
 48+# rubies. To ensure compatibility with themes, creates the
 49+# rvm_prompt_info function to return the $RBFU_RUBY_VERSION
 50+# version.
 51+
 52+command -v rbfu &>/dev/null
 53+
 54+if [[ $? -eq 0 ]]; then
 55+  eval "$(rbfu --init --auto)"
 56+
 57+  # Internal: Print ruby version details, if it's currently
 58+  # active etc.
 59+  function _rbfu_rubies_print() {
 60+    local rb rb_out
 61+    rb=$(basename $1)
 62+    rb_out="$rb"
 63+    [[ -h $1 ]] && rb_out="$rb_out${fg[green]}@${reset_color}"
 64+    [[ "x$rb" == "x$2" ]] && rb_out="${fg[red]}$rb_out ${fg[red]}*${reset_color}"
 65+    echo $rb_out
 66+  }
 67+
 68+  # Public: Provide a list with all available rubies, this basically depends
 69+  # on `ls -1` and .rfbu/rubies. Highlights the currently active ruby version
 70+  # and aliases.
 71+  function rbfu-rubies() {
 72+    local rbfu_dir active_rb
 73+    rbfu_dir=$RBFU_RUBIES
 74+    active_rb=$RBFU_RUBY_VERSION
 75+    [[ -z "$rbfu_dir" ]] && rbfu_dir="${HOME}/.rbfu/rubies"
 76+    [[ -z "$active_rb" ]] && active_rb="system"
 77+    _rbfu_rubies_print "${rbfu_dir}/system" $active_rb
 78+    for rb in $(ls -1 $rbfu_dir); do
 79+      _rbfu_rubies_print "${rbfu_dir}/${rb}" $active_rb
 80+    done
 81+  }
 82+
 83+  # Public: Create rvm_prompt_info command for themes compatibility, unless
 84+  # it has already been defined.
 85+  [ ! -x rvm_prompt_info ] && function rvm_prompt_info() { echo "${RBFU_RUBY_VERSION:=system}" }
 86+fi
 87diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
 88old mode 100644
 89new mode 100755
 90index c42c68df1d2b1a759dd618a18d75ce2d3685856a..91b0279c565cf503ce159fa9e55c0353df37f63e
 91--- a/plugins/sublime/sublime.plugin.zsh
 92+++ b/plugins/sublime/sublime.plugin.zsh
 93@@ -1,3 +1,9 @@
 94 # Sublime Text 2 Aliases
 95-alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
 96+#unamestr = 'uname'
 97+
 98+if [[ $('uname') == 'Linux' ]]; then
 99+	alias st='/usr/bin/sublime_text&'
100+elif  [[ $('uname') == 'Darwin' ]]; then
101+	alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
102+fi
103 alias stt='st .'
104diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
105index a93c8e8633351f5e31904d2c3d681043ced94739..5d0860400a0d83bd98912a7bd1a7470f6031a5b8 100644
106--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
107+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
108@@ -1,5 +1,5 @@
109 WRAPPER_FOUND=0
110-for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do
111+for wrapsource in "/usr/bin/virtualenvwrapper.sh" "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/virtualenvwrapper" ; do
112   if [[ -e $wrapsource ]] ; then
113     WRAPPER_FOUND=1
114     source $wrapsource
115diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
116new file mode 100644
117index 0000000000000000000000000000000000000000..c1b00c62bf6ec6889cd0f88c41321b4aabf971a8
118--- /dev/null
119+++ b/themes/af-magic.zsh-theme
120@@ -0,0 +1,36 @@
121+# af-magic.zsh-theme
122+#
123+# Author: Andy Fleming
124+# URL: http://andyfleming.com/
125+# Repo: https://github.com/andyfleming/oh-my-zsh
126+# Direct Link: https://github.com/andyfleming/oh-my-zsh/blob/master/themes/af-magic.zsh-theme
127+#
128+# Created on:		June 19, 2012
129+# Last modified on:	June 20, 2012
130+
131+
132+
133+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
134+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
135+
136+# primary prompt
137+PROMPT='$FG[237]------------------------------------------------------------%{$reset_color%}
138+$FG[032]%~\
139+$(git_prompt_info) \
140+$FG[105]%(!.#.»)%{$reset_color%} '
141+PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
142+RPS1='${return_code}'
143+
144+
145+# color vars
146+eval my_gray='$FG[237]'
147+eval my_orange='$FG[214]'
148+
149+# right prompt
150+RPROMPT='$my_gray%n@%m%{$reset_color%}%'
151+
152+# git settings
153+ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"
154+ZSH_THEME_GIT_PROMPT_CLEAN=""
155+ZSH_THEME_GIT_PROMPT_DIRTY="$my_orange*%{$reset_color%}"
156+ZSH_THEME_GIT_PROMPT_SUFFIX="$FG[075])%{$reset_color%}"
157diff --git a/themes/fino-time.zsh-theme b/themes/fino-time.zsh-theme
158new file mode 100644
159index 0000000000000000000000000000000000000000..22c7a09811e2efeb6b68dc1441f411f46c3c84c8
160--- /dev/null
161+++ b/themes/fino-time.zsh-theme
162@@ -0,0 +1,39 @@
163+# Fino-time theme by Aexander Berezovsky (http://berezovsky.me) based on Fino by Max Masnick (http://max.masnick.me)
164+
165+# Use with a dark background and 256-color terminal!
166+# Meant for people with RVM and git. Tested only on OS X 10.7.
167+
168+# You can set your computer name in the ~/.box-name file if you want.
169+
170+# Borrowing shamelessly from these oh-my-zsh themes:
171+#   bira
172+#   robbyrussell
173+#
174+# Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/
175+
176+function virtualenv_info {
177+    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
178+}
179+
180+function prompt_char {
181+    git branch >/dev/null 2>/dev/null && echo '±' && return
182+    echo '○'
183+}
184+
185+function box_name {
186+    [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
187+}
188+
189+
190+local rvm_ruby='‹$(rvm-prompt i v g)›%{$reset_color%}'
191+local current_dir='${PWD/#$HOME/~}'
192+local git_info='$(git_prompt_info)'
193+
194+