7e5dda7f434b847e4a8899beb736a7251da3d390
- Author
- fred-o <fredrik.appelberg@gmail.com>
- Committer
- fred-o <fredrik.appelberg@gmail.com>
- Date
Message
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diff
This diff is truncated to protect this page.
1diff --git a/README.textile b/README.textile
2index eca96808974a9f89b2c57095a7ca6dd5bd85c124..bf6776665fa72c8025dc64ff72d7a38d36e0380a 100644
3--- a/README.textile
4+++ b/README.textile
5@@ -56,7 +56,7 @@ the "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty tasty fo
6 h3. Customization
7
8 If you want to override any of the default behavior, just add a new file (ending in @.zsh@) into the @custom/@ directory.
9-If you have many functions which go good together you can put them as a *.plugin.zsh file in the @custom/plugins/@ directory and then enable this plugin.
10+If you have many functions which go well together you can put them as a *.plugin.zsh file in the @custom/plugins/@ directory and then enable this plugin.
11 If you would like to override the functionality of a plugin distributed with oh-my-zsh, create a plugin of the same name in the @custom/plugins/@ directory and it will be loaded instead of the one in @plugins/@.
12
13
14diff --git a/lib/git.zsh b/lib/git.zsh
15index defa062c6cb7cce62a7cbdf826f9850ae3a0298d..4d1634e8bc52d0e71721c88e9017cbdc2cc2018b 100644
16--- a/lib/git.zsh
17+++ b/lib/git.zsh
18@@ -61,4 +61,4 @@ git_prompt_status() {
19 STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
20 fi
21 echo $STATUS
22-}
23+}
24diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
25index aeeaa3daff380c9d556da4af4eb372e5fd6e6140..732a403b74c7f04ee2f283feb5b851c19c173889 100644
26--- a/oh-my-zsh.sh
27+++ b/oh-my-zsh.sh
28@@ -19,13 +19,19 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
29 ZSH_CUSTOM="$ZSH/custom"
30 fi
31
32+
33+is_plugin() {
34+ local base_dir=$1
35+ local name=$2
36+ test -f $base_dir/plugins/$name/$name.plugin.zsh \
37+ || test -f $base_dir/plugins/$name/_$name
38+}
39 # Add all defined plugins to fpath. This must be done
40 # before running compinit.
41-plugin=${plugin:=()}
42 for plugin ($plugins); do
43- if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then
44+ if is_plugin $ZSH_CUSTOM $plugin; then
45 fpath=($ZSH_CUSTOM/plugins/$plugin $fpath)
46- elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
47+ elif is_plugin $ZSH $plugin; then
48 fpath=($ZSH/plugins/$plugin $fpath)
49 fi
50 done
51diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
52index 6f9b80bffa077a9928ba2a2b7647b96c7588a3f1..6f0edb062ac60bba4abc7b5fe84962ba286f8dee 100644
53--- a/plugins/autojump/autojump.plugin.zsh
54+++ b/plugins/autojump/autojump.plugin.zsh
55@@ -1,5 +1,9 @@
56-if [ -f /opt/local/etc/profile.d/autojump.sh ]; then
57- . /opt/local/etc/profile.d/autojump.sh
58-elif [ -f `brew --prefix`/etc/autojump ]; then
59- . `brew --prefix`/etc/autojump
60+if [ $commands[autojump] ]; then # check if autojump is installed
61+ if [ -f /usr/share/autojump/autojump.zsh ]; then # debian and ubuntu package
62+ . /usr/share/autojump/autojump.zsh
63+ elif [ -f /etc/profile.d/autojump.zsh ]; then # manual installation
64+ . /etc/profile.d/autojump.zsh
65+ elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump ]; then # mac os x with brew
66+ . `brew --prefix`/etc/autojump
67+ fi
68 fi
69diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
70index 55564a252fce5d6d62ec745612067398ec4f8fce..5e9b82336a0db3ee7ca0d8577dfc0c9f79943c5b 100644
71--- a/plugins/bundler/bundler.plugin.zsh
72+++ b/plugins/bundler/bundler.plugin.zsh
73@@ -1,7 +1,3 @@
74-fpath=($ZSH/plugins/bundler $fpath)
75-autoload -U compinit
76-compinit -i
77-
78 alias be="bundle exec"
79 alias bi="bundle install"
80 alias bl="bundle list"
81@@ -10,7 +6,7 @@ alias bu="bundle update"
82
83 # The following is based on https://github.com/gma/bundler-exec
84
85-bundled_commands=(annotate cap capify cucumber foreman guard heroku nanoc rackup rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
86+bundled_commands=(annotate cap capify cucumber ey foreman guard heroku middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
87
88 ## Functions
89
90@@ -20,7 +16,7 @@ _bundler-installed() {
91
92 _within-bundled-project() {
93 local check_dir=$PWD
94- while [ "$(dirname $check_dir)" != "/" ]; do
95+ while [ $check_dir != "/" ]; do
96 [ -f "$check_dir/Gemfile" ] && return
97 check_dir="$(dirname $check_dir)"
98 done
99diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
100index 1d72a2f2c13f20d33ee63f5ec9918621bdb6827a..0bbd031fe01c257af863551e5be86e6a3ea023b5 100644
101--- a/plugins/django/django.plugin.zsh
102+++ b/plugins/django/django.plugin.zsh
103@@ -220,3 +220,4 @@ _managepy() {
104
105 compdef _managepy manage.py
106 compdef _managepy django
107+compdef _managepy django-manage
108diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
109index 8cc17f7d4be725da84afaf018cb8343e3048ad5d..5c125e98b06d1daa9dd18d2ad5054f5e86c3a27e 100644
110--- a/plugins/extract/extract.plugin.zsh
111+++ b/plugins/extract/extract.plugin.zsh
112@@ -78,8 +78,3 @@ function extract() {
113
114 alias x=extract
115
116-# add extract completion function to path
117-fpath=($ZSH/plugins/extract $fpath)
118-autoload -U compinit
119-compinit -i
120-
121diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
122index c1b382b2c2df245817fb2998b9c31ea4144de526..e1d68250885a7e29e286e30b469fc17e9ae5cc3b 100644
123--- a/plugins/git/git.plugin.zsh
124+++ b/plugins/git/git.plugin.zsh
125@@ -9,7 +9,7 @@ alias gup='git fetch && git rebase'
126 compdef _git gup=git-fetch
127 alias gp='git push'
128 compdef _git gp=git-push
129-gdv() { git-diff -w "$@" | view - }
130+gdv() { git diff -w "$@" | view - }
131 compdef _git gdv=git-diff
132 alias gc='git commit -v'
133 compdef _git gc=git-commit
134@@ -36,6 +36,8 @@ alias ga='git add'
135 compdef _git ga=git-add
136 alias gm='git merge'
137 compdef _git gm=git-merge
138+alias grh='git reset HEAD'
139+alias grhh='git reset HEAD --hard'
140
141 # Git and svn mix
142 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
143@@ -58,4 +60,4 @@ compdef ggpull=git
144 alias ggpush='git push origin $(current_branch)'
145 compdef ggpush=git
146 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
147-compdef ggpnp=git
148+compdef ggpnp=git
149diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
150index 9b0d54602fcfe03edc072921cbe2134908250286..197e86a48743419f79cceb8f4d4ebdafca0a5972 100644
151--- a/plugins/github/github.plugin.zsh
152+++ b/plugins/github/github.plugin.zsh
153@@ -1,7 +1,17 @@
154 # Setup hub function for git, if it is available; http://github.com/defunkt/hub
155 if [ "$commands[(I)hub]" ] && [ "$commands[(I)ruby]" ]; then
156 # eval `hub alias -s zsh`
157- function git(){hub "$@"}
158+ function git(){
159+ if ! (( $+_has_working_hub )); then
160+ hub --version &> /dev/null
161+ _has_working_hub=$(($? == 0))
162+ fi
163+ if (( $_has_working_hub )) ; then
164+ hub "$@"
165+ else
166+ command git "$@"
167+ fi
168+ }
169 fi
170
171 # Functions #################################################################
172diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
173index 2988f0a4678b3a337312e8ee80bce20ce34889cc..caf0d9efc81196a73e9b8592fd3a0a3b0f46ed17 100644
174--- a/plugins/mercurial/mercurial.plugin.zsh
175+++ b/plugins/mercurial/mercurial.plugin.zsh
176@@ -1,14 +1,14 @@
177
178 # Mercurial
179-alias hgc='hg commit -v'
180-alias hgb='hg branch -v'
181+alias hgc='hg commit'
182+alias hgb='hg branch'
183 alias hgba='hg branches'
184 alias hgco='hg checkout'
185 alias hgd='hg diff'
186 alias hged='hg diffmerge'
187 # pull and update
188-alias hgl='hg pull -u -v'
189-alias hgp='hg push -v'
190-alias hgs='hg status -v'
191+alias hgl='hg pull -u'
192+alias hgp='hg push'
193+alias hgs='hg status'
194 # this is the 'git commit --amend' equivalent
195 alias hgca='hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip'
196diff --git a/plugins/pow/pow.plugin.zsh b/plugins/pow/pow.plugin.zsh
197index 6b2a6f2be0f3636c9026eb82a0405eebc79669b4..399a54cb02aae802afb95f72a343b35b1412f779 100644
198--- a/plugins/pow/pow.plugin.zsh
199+++ b/plugins/pow/pow.plugin.zsh
200@@ -1,10 +1,66 @@
201-# Thanks to Christopher Sexton
202-# https://gist.github.com/965032
203-function kapow {
204- touch ~/.pow/$1/tmp/restart.txt
205- if [ $? -eq 0 ]; then
206- echo "$fg[yellow]Pow restarting $1...$reset_color"
207- fi
208+# Restart a rack app running under pow
209+# http://pow.cx/
210+#
211+# Adds a kapow command that will restart an app
212+#
213+# $ kapow myapp
214+#
215+# Supports command completion.
216+#
217+# If you are not already using completion you might need to enable it with
218+#
219+# autoload -U compinit compinit
220+#
221+# Changes:
222+#
223+# Defaults to the current application, and will walk up the tree to find
224+# a config.ru file and restart the corresponding app
225+#
226+# Will Detect if a app does not exist in pow and print a (slightly) helpful
227+# error message
228+
229+rack_root_detect(){
230+ setopt chaselinks
231+ local orgdir=$(pwd)
232+ local basedir=$(pwd)
233+
234+ while [[ $basedir != '/' ]]; do
235+ test -e "$basedir/config.ru" && break
236+ builtin cd ".." 2>/dev/null
237+ basedir="$(pwd)"
238+ done
239+
240+ builtin cd $orgdir 2>/dev/null
241+ [[ ${basedir} == "/" ]] && return 1
242+ echo `basename $basedir | sed -E "s/.(com|net|org)//"`
243 }
244
245+kapow(){
246+ local vhost=$1
247+ [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
248+ if [ ! -h ~/.pow/$vhost ]
249+ then
250+ echo "pow: This domain isn’t set up yet. Symlink your application to ${vhost} first."
251+ return 1
252+ fi
253+
254+ [ ! -d ~/.pow/${vhost}/tmp ] && mkdir -p ~/.pow/$vhost/tmp
255+ touch ~/.pow/$vhost/tmp/restart.txt;
256+ [ $? -eq 0 ] && echo "pow: restarting $vhost.dev"
257+}
258 compctl -W ~/.pow -/ kapow
259+
260+powit(){
261+ local basedir=$(pwd)
262+ local vhost=$1
263+ [ ! -n "$vhost" ] && vhost=$(rack_root_detect)
264+ if [ ! -h ~/.pow/$vhost ]
265+ then
266+ echo "pow: Symlinking your app with pow. ${vhost}"
267+ [ ! -d ~/.pow/${vhost} ] && ln -s $basedir ~/.pow/$vhost
268+ return 1
269+ fi
270+}
271+
272+# View the standard out (puts) from any pow app
273+alias kaput="tail -f ~/Library/Logs/Pow/apps/*"
274diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
275index ac8119e837611d4a19ea146a8e7c4242a8982922..4aa7a05d6db43ff6a824cf90553564e9fa9572ec 100644
276--- a/plugins/rails/rails.plugin.zsh
277+++ b/plugins/rails/rails.plugin.zsh
278@@ -2,6 +2,7 @@ alias ss='thin --stats "/thin/stats" start'
279 alias sg='ruby script/generate'
280 alias sd='ruby script/destroy'
281 alias sp='ruby script/plugin'
282+alias sr='ruby script/runner'
283 alias ssp='ruby script/spec'
284 alias rdbm='rake db:migrate'
285 alias sc='ruby script/console'
286diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
287index 792cde2bd07b472d55c41393439a3306288db7cb..d4c7df6548740c9c34c3729b34c03a4e7b9b5ecf 100644
288--- a/plugins/rails3/rails3.plugin.zsh
289+++ b/plugins/rails3/rails3.plugin.zsh
290@@ -14,6 +14,7 @@ alias rdb='_rails_command dbconsole'
291 alias rdbm='rake db:migrate db:test:clone'
292 alias rg='_rails_command generate'
293 alias rp='_rails_command plugin'
294+alias ru='_rails_command runner'
295 alias rs='_rails_command server'
296 alias rsd='_rails_command server --debugger'
297 alias devlog='tail -f log/development.log'
298diff --git a/plugins/rake/rake.plugin.zsh b/plugins/rake/rake.plugin.zsh
299new file mode 100644
300index 0000000000000000000000000000000000000000..16b933c14c104dc953bed61dbe31ff1570cd0904
301--- /dev/null
302+++ b/plugins/rake/rake.plugin.zsh
303@@ -0,0 +1,6 @@
304+alias rake="noglob rake" # allows square brackts for rake task invocation
305+alias brake='noglob bundle exec rake' # execute the bundled rake gem
306+alias srake='noglob sudo rake' # noglob must come before sudo
307+alias sbrake='noglob sudo bundle exec rake' # altogether now ...
308+
309+
310diff --git a/plugins/taskwarrior/_task b/plugins/taskwarrior/_task
311index 5bffa9119e439c633ef8fd156b7233fd4ed9b61e..0bda738bb85ee766af63a4db4de6e64c946265a9 100644
312--- a/plugins/taskwarrior/_task
313+++ b/plugins/taskwarrior/_task
314@@ -1,37 +1,37 @@
315 #compdef task
316-#
317 # zsh completion for taskwarrior
318 #
319+# taskwarrior - a command line task list manager.
320+#
321 # Copyright 2010 - 2011 Johannes Schlatow
322 # Copyright 2009 P.C. Shyamshankar
323-# All rights reserved.
324-#
325-# This script is part of the taskwarrior project.
326 #
327-# This program is free software; you can redistribute it and/or modify it under
328-# the terms of the GNU General Public License as published by the Free Software
329-# Foundation; either version 2 of the License, or (at your option) any later
330-# version.
331+# Permission is hereby granted, free of charge, to any person obtaining a copy
332+# of this software and associated documentation files (the "Software"), to deal
333+# in the Software without restriction, including without limitation the rights
334+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
335+# copies of the Software, and to permit persons to whom the Software is
336+# furnished to do so, subject to the following conditions:
337 #
338-# This program is distributed in the hope that it will be useful, but WITHOUT
339-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
340-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
341-# details.
342+# The above copyright notice and this permission notice shall be included
343+# in all copies or substantial portions of the Software.
344 #
345-# You should have received a copy of the GNU General Public License along with
346-# this program; if not, write to the
347+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
348+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
349+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
350+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
351+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
352+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
353+# SOFTWARE.
354 #
355-# Free Software Foundation, Inc.,
356-# 51 Franklin Street, Fifth Floor,
357-# Boston, MA
358-# 02110-1301
359-# USA
360+# http://www.opensource.org/licenses/mit-license.php
361 #
362 typeset -g _task_cmds _task_projects _task_tags _task_config _task_modifiers
363 _task_projects=($(task _projects))
364 _task_tags=($(task _tags))
365 _task_ids=($(task _ids))
366 _task_config=($(task _config))
367+_task_columns=($(task _columns))
368 _task_modifiers=(
369 'before' \
370 'after' \
371@@ -46,39 +46,19 @@ _task_modifiers=(
372 'word' \
373 'noword'
374 )
375+_task_conjunctions=(
376+ 'and' \
377+ 'or' \
378+ 'xor' \
379+ '\)'
380+ '\('
381+)
382 _task_cmds=($(task _commands))
383 _task_zshcmds=( ${(f)"$(task _zshcommands)"} )
384
385-
386-_task_idCmds=(
387- 'append' \
388- 'prepend' \
389- 'annotate' \
390- 'denotate' \
391- 'edit' \
392- 'duplicate' \
393- 'info' \
394- 'start' \
395- 'stop' \
396- 'done'
397-)
398-
399-_task_idCmdsDesc=(
400- 'append:Appends more description to an existing task.' \
401- 'prepend:Prepends more description to an existing task.' \
402- 'annotate:Adds an annotation to an existing task.' \
403- 'denotate:Deletes an annotation of an existing task.' \
404- 'edit:Launches an editor to let you modify a task directly.' \
405- 'duplicate:Duplicates the specified task, and allows modifications.' \
406- 'info:Shows all data, metadata for specified task.' \
407- 'start:Marks specified task as started.' \
408- 'stop:Removes the start time from a task.' \
409- 'done:Marks the specified task as completed.'
410-)
411-
412 _task() {
413 _arguments -s -S \
414diff --git a/themes/alanpeabody.zsh-theme b/themes/alanpeabody.zsh-theme
415index 1f66f1ec36e50a75f6f8503b5ec3a08bb66c0da0..4a1b1b3861d7f70e7471ec94b2854182f47c0773 100644
416--- a/themes/alanpeabody.zsh-theme
417+++ b/themes/alanpeabody.zsh-theme
418@@ -1,7 +1,14 @@
419
420 local user='%{$fg[magenta]%}%n@%{$fg[magenta]%}%m%{$reset_color%}'
421 local pwd='%{$fg[blue]%}%~%{$reset_color%}'
422-local rvm='%{$fg[green]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
423+local rvm=''
424+if which rvm-prompt &> /dev/null; then
425+ rvm='%{$fg[green]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
426+else
427+ if which rbenv &> /dev/null; then
428+ rvm='%{$fg[green]%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}'
429+ fi
430+fi
431 local return_code='%(?..%{$fg[red]%}%? ↵%{$reset_color%})'
432 local git_branch='$(git_prompt_status)%{$reset_color%}$(git_prompt_info)%{$reset_color%}'
433
434@@ -19,4 +26,3 @@ ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
435
436 PROMPT="${user} ${pwd}$ "
437 RPROMPT="${return_code} ${git_branch} ${rvm}"
438-
439diff --git a/themes/bira.zsh-theme b/themes/bira.zsh-theme
440index 5642eaeb86001bd4d4257f89f63b76cd0ab43842..2157204778f6c346569e4f69d638ce7c792a685f 100644
441--- a/themes/bira.zsh-theme
442+++ b/themes/bira.zsh-theme
443@@ -3,7 +3,14 @@ local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
444
445 local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}'
446 local current_dir='%{$terminfo[bold]$fg[blue]%} %~%{$reset_color%}'
447-local rvm_ruby='%{$fg[red]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
448+local rvm_ruby=''
449+if which rvm-prompt &> /dev/null; then
450+ rvm_ruby='%{$fg[red]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
451+else
452+ if which rbenv &> /dev/null; then
453+ rvm_ruby='%{$fg[red]%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}'
454+ fi
455+fi
456 local git_branch='$(git_prompt_info)%{$reset_color%}'
457
458 PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch}
459diff --git a/themes/crunch.zsh-theme b/themes/crunch.zsh-theme
460index 2473cd230e9f95e303bd0f5ff4c4434b020e4bfe..b2759a1b0fe9d7f05b04f34baac42de073b8092a 100644
461--- a/themes/crunch.zsh-theme
462+++ b/themes/crunch.zsh-theme
463@@ -29,7 +29,13 @@ ZSH_THEME_GIT_PROMPT_DIRTY=" $CRUNCH_GIT_DIRTY_COLOR✗"
464
465 # Our elements:
466 CRUNCH_TIME_="$CRUNCH_BRACKET_COLOR{$CRUNCH_TIME_COLOR%T$CRUNCH_BRACKET_COLOR}%{$reset_color%}"
467-CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\${\$(~/.rvm/bin/rvm-prompt i v g)#ruby-}$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}"
468+if which rvm-prompt &> /dev/null; then
469+ CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\${\$(~/.rvm/bin/rvm-prompt i v g)#ruby-}$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}"
470+else
471+ if which rbenv &> /dev/null; then
472+ CRUNCH_RVM_="$CRUNCH_BRACKET_COLOR"["$CRUNCH_RVM_COLOR\${\$(rbenv version | sed -e 's/ (set.*$//' -e 's/^ruby-//')}$CRUNCH_BRACKET_COLOR"]"%{$reset_color%}"
473+ fi
474+fi
475 CRUNCH_DIR_="$CRUNCH_DIR_COLOR%~\$(git_prompt_info) "
476 CRUNCH_PROMPT="$CRUNCH_BRACKET_COLOR➭ "
477
478diff --git a/themes/dallas.zsh-theme b/themes/dallas.zsh-theme
479index eef32e998221760ca1eea9a4bd13e7474dcd80fe..e9b4f852a36d45c65e634b9209da8d40f95867de 100644
480--- a/themes/dallas.zsh-theme
481+++ b/themes/dallas.zsh-theme
482@@ -3,7 +3,13 @@
483 # Grab the current date (%D) and time (%T) wrapped in {}: {%D %T}
484 DALLAS_CURRENT_TIME_="%{$fg[white]%}{%{$fg[yellow]%}%D %T%{$fg[white]%}}%{$reset_color%}"
485 # Grab the current version of ruby in use (via RVM): [ruby-1.8.7]
486-DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
487+if which rvm-prompt &> /dev/null; then
488+ DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
489+else
490+ if which rbenv &> /dev/null; then
491+ DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg[white]%}]%{$reset_color%}"
492+ fi
493+fi
494 # Grab the current machine name: muscato
495 DALLAS_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}"
496 # Grab the current filepath, use shortcuts: ~/Desktop
497diff --git a/themes/eastwood.zsh-theme b/themes/eastwood.zsh-theme
498index 83664515adf78e8b3136f68e4a2e8bdd7c2f2d14..db2529990be4c95dce739357ec7633b7844b718f 100644
499--- a/themes/eastwood.zsh-theme
500+++ b/themes/eastwood.zsh-theme
501@@ -1,6 +1,10 @@
502 #RVM settings
503 if [[ -s ~/.rvm/scripts/rvm ]] ; then
504 RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1"
505+else
506+ if which rbenv &> /dev/null; then
507+ RPS1="%{$fg[yellow]%}rbenv:%{$reset_color%}%{$fg[red]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$reset_color%} $EPS1"
508+ fi
509 fi
510
511 ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
512diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
513index 17cf597086c2cd501f928ddaf6b287ab6a1687cb..26e5471761d6b54fa17f28a76f489ea6e48eea11 100644
514--- a/themes/fino.zsh-theme
515+++ b/themes/fino.zsh-theme
516@@ -25,7 +25,14 @@ function box_name {
517 }
518
519
520-local rvm_ruby='‹$(rvm-prompt i v g)›%{$reset_color%}'
521+local rvm_ruby=''
522+if which rvm-prompt &> /dev/null; then
523+ rvm_ruby='‹$(rvm-prompt i v g)›%{$reset_color%}'
524+else
525+ if which rbenv &> /dev/null; then
526+ rvm_ruby='‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}'
527+ fi
528+fi
529 local current_dir='${PWD/#$HOME/~}'
530 local git_info='$(git_prompt_info)'
531
532diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
533index f9406dd966d1132f556ad3cb120b4a542cdd88d8..3eac14867e68cfbcc965a58b0f1978d2a7094f5b 100644
534--- a/themes/gallois.zsh-theme
535+++ b/themes/gallois.zsh-theme
536@@ -15,7 +15,11 @@ git_custom_status() {
537 if [[ -s ~/.rvm/scripts/rvm ]] ; then
538 RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1'
539 else
540- RPS1='$(git_custom_status) $EPS1'
541+ if which rbenv &> /dev/null; then
542+ RPS1='$(git_custom_status)%{$fg[red]%}[`rbenv version | sed -e "s/ (set.*$//"`]%{$reset_color%} $EPS1'
543+ else
544+ RPS1='$(git_custom_status) $EPS1'
545+ fi
546 fi
547
548 PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '
549diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
550index a170a13d0b435e835244c1cb945dbf07f4474beb..2f0c4b917a18d7023d1bc26d7f3235a58a6ca8a8 100644
551--- a/themes/jonathan.zsh-theme
552+++ b/themes/jonathan.zsh-theme
553@@ -10,7 +10,7 @@ function theme_precmd {
554 PR_PWDLEN=""
555
556 local promptsize=${#${(%):---(%n@%m:%l)---()--}}
557- local rubyprompt=`rvm_prompt_info`
558+ local rubyprompt=`rvm_prompt_info || rbenv_prompt_info`
559 local rubypromptsize=${#${rubyprompt}}
560 local pwdsize=${#${(%):-%~}}
561
562@@ -113,7 +113,7 @@ setprompt () {
563 PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
564 $PR_CYAN$PR_SHIFT_IN$PR_ULCORNER$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
565 $PR_GREEN%$PR_PWDLEN<...<%~%<<\
566-$PR_GREY)`rvm_prompt_info`$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
567+$PR_GREY)`rvm_prompt_info || rbenv_prompt_info`$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
568 $PR_CYAN%(!.%SROOT%s.%n)$PR_GREY@$PR_GREEN%m:%l\
569 $PR_GREY)$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_URCORNER$PR_SHIFT_OUT\
570
571diff --git a/themes/josh.zsh-theme b/themes/josh.zsh-theme
572index 6bed1a70e46716437afb494ed699c724bd8df670..142e768380e23b1d0b11b4b63fc4ca31a2b43867 100644
573--- a/themes/josh.zsh-theme
574+++ b/themes/josh.zsh-theme
575@@ -10,7 +10,7 @@ function josh_prompt {
576 prompt=" "
577
578 branch=$(current_branch)
579- ruby_version=$(rvm_prompt_info)
580+ ruby_version=$(rvm_prompt_info || rbenv_prompt_info)
581 path_size=${#PWD}
582 branch_size=${#branch}
583 ruby_size=${#ruby_version}
584@@ -31,7 +31,7 @@ function josh_prompt {
585 prompt=" $prompt"
586 done
587
588- prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info)%{$reset_color%} $(git_prompt_info)"
589+ prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(git_prompt_info)"
590
591 echo $prompt
592 }
593diff --git a/themes/macovsky-ruby.zsh-theme b/themes/macovsky-ruby.zsh-theme
594index 4eb410233f96bbfa0f43b47122964eaee3ee893f..0453767613524b9b8d55ad480db8232d0628d438 100644
595--- a/themes/macovsky-ruby.zsh-theme
596+++ b/themes/macovsky-ruby.zsh-theme
597@@ -1,7 +1,14 @@
598 # ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
599 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
600
601-PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
602+if which rvm-prompt &> /dev/null; then
603+ PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
604+else
605+ if which rbenv &> /dev/null; then
606+ PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(rbenv version | sed -e "s/ (set.*$//")› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
607+ fi
608+fi
609+
610 RPS1="${return_code}"
611
612 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
613diff --git a/themes/macovsky.zsh-theme b/themes/macovsky.zsh-theme
614index 4eb410233f96bbfa0f43b47122964eaee3ee893f..b6978b9290fce5b6a5b27509cdcef12c9d507e0a 100644
615--- a/themes/macovsky.zsh-theme
616+++ b/themes/macovsky.zsh-theme
617@@ -1,7 +1,13 @@
618 # ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
619 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
620
621-PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
622+if which rvm-prompt &> /dev/null; then
623+ PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v)› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
624+else
625+ if which rbenv &> /dev/null; then
626+ PROMPT='%{$fg[green]%}%~%{$reset_color%} %{$fg[red]%}‹$(rbenv version | sed -e "s/ (set.*$//")› %{$reset_color%} $(git_prompt_info)%{$reset_color%}%B$%b '
627+ fi
628+fi
629 RPS1="${return_code}"
630
631 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
632diff --git a/themes/mortalscumbag.zsh-theme b/themes/mortalscumbag.zsh-theme
633new file mode 100644
634index 0000000000000000000000000000000000000000..7e25b149f8627231e0581d2ea531c76591dc987d
635--- /dev/null
636+++ b/themes/mortalscumbag.zsh-theme
637@@ -0,0 +1,58 @@
638+function my_git_prompt() {
639+ tester=$(git rev-parse --git-dir 2> /dev/null) || return
640+
641+ INDEX=$(git status --porcelain 2> /dev/null)
642+ STATUS=""
643+
644+ # is branch ahead?
645+ if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
646+ STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
647+ fi
648+
649+ # is anything staged?
650+ if $(echo "$INDEX" | grep -E -e '^(D[ M]|[MARC][ MD]) ' &> /dev/null); then
651+ STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
652+ fi
653+
654+ # is anything unstaged?
655+ if $(echo "$INDEX" | grep -E -e '^[ MARC][MD] ' &> /dev/null); then
656+ STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
657+ fi
658+
659+ # is anything untracked?
660+ if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then
661+ STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
662+ fi
663+
664+ # is anything unmerged?
665+ if $(echo "$INDEX" | grep -E -e '^(A[AU]|D[DU]|U[ADU]) ' &> /dev/null); then
666+ STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
667+ fi
668+
669+ if [[ -n $STATUS ]]; then
670+ STATUS=" $STATUS"
671+ fi
672+
673+ echo "$ZSH_THEME_GIT_PROMPT_PREFIX$(my_current_branch)$STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX"
674+}
675+
676+function my_current_branch() {
677+ echo $(current_branch || echo "(no branch)")
678+}
679+
680+function ssh_connection() {
681+ if [[ -n $SSH_CONNECTION ]]; then
682+ echo "%{$fg_bold[red]%}(ssh) "
683+ fi
684+}
685+
686+PROMPT=$'\n$(ssh_connection)%{$fg_bold[green]%}%n@%m%{$reset_color%}$(my_git_prompt) : %~\n%# '
687+
688+ZSH_THEME_PROMPT_RETURNCODE_PREFIX="%{$fg_bold[red]%}"
689+ZSH_THEME_GIT_PROMPT_PREFIX=" $fg[white]‹ %{$fg_bold[yellow]%}"
690+ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg_bold[magenta]%}↑"
691+ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_bold[green]%}●"
692+ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[red]%}●"
693+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[white]%}●"
694+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[red]%}✕"
695+ZSH_THEME_GIT_PROMPT_SUFFIX=" $fg_bold[white]›%{$reset_color%}"
696diff --git a/themes/murilasso.zsh-theme b/themes/murilasso.zsh-theme
697index 310357b4586efe5b43594277c7ee88f48a2f7152..bc2b9b22465fdde33561b496104e395f3972bc30 100644
698--- a/themes/murilasso.zsh-theme
699+++ b/themes/murilasso.zsh-theme
700@@ -1,7 +1,7 @@
701 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
702 local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}'
703 local current_dir='%{$terminfo[bold]$fg[blue]%}%~%{$reset_color%}'
704-local rvm_ruby='%{$fg[red]%}$(rvm_prompt_info)%{$reset_color%}'
705+local rvm_ruby='%{$fg[red]%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%}'
706 local git_branch='%{$fg[blue]%}$(git_prompt_info)%{$reset_color%}'
707
708 PROMPT="${user_host}:${current_dir} ${rvm_ruby}
709diff --git a/themes/nebirhos.zsh-theme b/themes/nebirhos.zsh-theme
710index c49df972eb6af42a2de689a7d3cc42d648e02443..c5864d9b8d81641dafea787ef6b4af4573890525 100644
711--- a/themes/nebirhos.zsh-theme
712+++ b/themes/nebirhos.zsh-theme
713@@ -4,6 +4,10 @@
714 # Get the current ruby version in use with RVM:
715 if [ -e ~/.rvm/bin/rvm-prompt ]; then
716 RUBY_PROMPT_="%{$fg_bold[blue]%}rvm:(%{$fg[green]%}\$(~/.rvm/bin/rvm-prompt s i v g)%{$fg_bold[blue]%})%{$reset_color%} "
717+else
718+ if which rbenv &> /dev/null; then
719+ RUBY_PROMPT_="%{$fg_bold[blue]%}rvm:(%{$fg[green]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg_bold[blue]%})%{$reset_color%} "
720+ fi
721 fi
722
723 # Get the host name (first 4 chars)
724diff --git a/themes/superjarin.zsh-theme b/themes/superjarin.zsh-theme
725index 16eeb53162d0531aaca9a6fb4cfa5f76579149b0..0be816de0af852876b34a9ee817a81cd7fc97f4e 100644
726--- a/themes/superjarin.zsh-theme
727+++ b/themes/superjarin.zsh-theme
728@@ -1,5 +1,11 @@
729 # Grab the current version of ruby in use (via RVM): [ruby-1.8.7]
730-JARIN_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
731+if which rvm-prompt &> /dev/null; then
732+ JARIN_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
733+else
734+ if which rbenv &> /dev/null; then
735+ JARIN_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[red]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg[white]%}]%{$reset_color%}"
736+ fi
737+fi
738
739 # Grab the current filepath, use shortcuts: ~/Desktop
740 # Append the current git branch, if in a git repository
741diff --git a/themes/suvash.zsh-theme b/themes/suvash.zsh-theme
742index f50657db2c909def178fa5762def0f9ab613157d..c87f6455851df07b2659688761be347199244c97 100644
743--- a/themes/suvash.zsh-theme
744+++ b/themes/suvash.zsh-theme
745@@ -12,8 +12,15 @@ function collapse_pwd {
746 echo $(pwd | sed -e "s,^$HOME,~,")
747 }
748
749-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%}
750+if which rvm-prompt &> /dev/null; then
751+ 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%}
752 $(virtualenv_info)$(prompt_char) '
753+else
754+ if which rbenv &> /dev/null; then
755+ 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%}
756+$(virtualenv_info)$(prompt_char) '
757+ fi
758+fi
759
760
761 ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
762diff --git a/themes/wuffers.zsh-theme b/themes/wuffers.zsh-theme
763index 182d8a34fd0ae8cb9f08658fb68e3fc1ec84138d..4019d0a51d134791ac2b7097c86babfa331d9175 100644
764--- a/themes/wuffers.zsh-theme
765+++ b/themes/wuffers.zsh-theme
766@@ -2,4 +2,4 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}["
767 ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
768 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%} x%{$fg_bold[blue]%}"
769
770-PROMPT='%{$(git_prompt_info)%}%{$fg_bold[green]%}{%{$(rvm current)%}}%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} '
771+PROMPT='%{$(git_prompt_info)%}%{$fg_bold[green]%}{%{$(rvm current 2>/dev/null || rbenv version-name 2>/dev/null)%}}%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} '
772diff --git a/themes/zhann.zsh-theme b/themes/zhann.zsh-theme
773index 3dff29c9c71cfaac9f0d67d0b7fb752e6224edc1..574e0cec3b17b8549d4a66dc81b8b0b8a2262b8e 100644
774--- a/themes/zhann.zsh-theme
775+++ b/themes/zhann.zsh-theme
776@@ -1,5 +1,13 @@
777 PROMPT='%{$fg_bold[green]%}%p %{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
778-RPROMPT='%{$reset_color%} %{$fg[red]%}$(~/.rvm/bin/rvm-prompt i v g) %{$reset_color%}'
779+
780+if which rvm-prompt &> /dev/null; then
781+ RPROMPT='%{$reset_color%} %{$fg[red]%}$(~/.rvm/bin/rvm-prompt i v g) %{$reset_color%}'
782+else
783+ if which rbenv &> /dev/null; then
784+ RPROMPT='%{$reset_color%} %{$fg[red]%}$(rbenv version | sed -e "s/ (set.*$//") %{$reset_color%}'
785+ fi
786+fi
787+
788
789 ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[red]%}"
790 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
791diff --git a/tools/upgrade.sh b/tools/upgrade.sh
792index 6ffe56f4caa1c353c759c2586b8ef25f50ca2487..b2a1c06c430171567c25ed5b8e5aff5b2983d2a6 100644
793--- a/tools/upgrade.sh
794+++ b/tools/upgrade.sh
795@@ -1,12 +1,19 @@
796 current_path=`pwd`
797 printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
798-( cd $ZSH && git pull origin master )
799-printf '\033[0;32m%s\033[0m\n' ' __ __ '
800-printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '
801-printf '\033[0;32m%s\033[0m\n' ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '
802-printf '\033[0;32m%s\033[0m\n' '/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '
803-printf '\033[0;32m%s\033[0m\n' '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '
804-printf '\033[0;32m%s\033[0m\n' ' /____/ '
805-printf '\033[0;34m%s\033[0m\n' 'Hooray! Oh My Zsh has been updated and/or is at the current version.'
806-printf '\033[0;34m%s\033[1m%s\033[0m\n' 'To keep up on the latest, be sure to follow Oh My Zsh on twitter: ' 'http://twitter.com/ohmyzsh'
807-cd "$current_path"
808+cd $ZSH
809+
810+if git pull origin master
811+then
812+ printf '\033[0;32m%s\033[0m\n' ' __ __ '
813+ printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '
814+ printf '\033[0;32m%s\033[0m\n' ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '
815+ printf '\033[0;32m%s\033[0m\n' '/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '
816+ printf '\033[0;32m%s\033[0m\n' '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '
817+ printf '\033[0;32m%s\033[0m\n' ' /____/ '
818+ printf '\033[0;34m%s\033[0m\n' 'Hooray! Oh My Zsh has been updated and/or is at the current version.'
819+ printf '\033[0;34m%s\033[1m%s\033[0m\n' 'To keep up on the latest, be sure to follow Oh My Zsh on twitter: ' 'http://twitter.com/ohmyzsh'
820+else
821+ printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?'
822+fi
823+
824+cd "$current_path"