2a43c5eebdb1976277d760b435045ac4e7c95e61

Message

Merge pull request #684 from masnick/master

Update to fino.zsh-theme

Diff

This diff is truncated to protect this page.

 1diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
 2index 26e5471761d6b54fa17f28a76f489ea6e48eea11..4c7aabcff79d5dc5f701c5e22b995f8cb8baab74 100644
 3--- a/themes/fino.zsh-theme
 4+++ b/themes/fino.zsh-theme
 5@@ -1,7 +1,7 @@
 6 # Fino theme by Max Masnick (http://max.masnick.me)
 7 
 8 # Use with a dark background and 256-color terminal!
 9-# Meant for people with RVM and git. Tested only on OS X 10.7.
10+# Meant for people with rbenv and git. Tested only on OS X 10.7.
11 
12 # You can set your computer name in the ~/.box-name file if you want.
13 
14@@ -11,34 +11,32 @@
15 #
16 # Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/
17 
18-function virtualenv_info {
19-    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
20-}
21 
22 function prompt_char {
23-    git branch >/dev/null 2>/dev/null && echo '±' && return
24-    echo '○'
25+  git branch >/dev/null 2>/dev/null && echo "±" && return
26+  echo '○'
27 }
28 
29 function box_name {
30     [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
31 }
32 
33-
34-local rvm_ruby=''
35+local ruby_env=''
36 if which rvm-prompt &> /dev/null; then
37-  rvm_ruby='‹$(rvm-prompt i v g)›%{$reset_color%}'
38+  ruby_env=' ‹$(rvm-prompt i v g)›%{$reset_color%}'
39 else
40   if which rbenv &> /dev/null; then
41-    rvm_ruby='‹$(rbenv version | sed -e "s/ (set.*$//")›%{$reset_color%}'
42+    ruby_env=' ‹$(rbenv version-name)›%{$reset_color%}'
43   fi
44 fi
45+
46 local current_dir='${PWD/#$HOME/~}'
47 local git_info='$(git_prompt_info)'
48+local prompt_char='$(prompt_char)'
49 
50