6b3c9537754b4a2180648258341ae2d7ca203d1e

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

Message

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

Diff

 1diff --git a/plugins/cabal/cabal.plugin.zsh b/plugins/cabal/cabal.plugin.zsh
 2index 8d3c64587155a75a48055fa28d649159d328a874..9f76add7a30a791add54a4b5af864b4d18172262 100644
 3--- a/plugins/cabal/cabal.plugin.zsh
 4+++ b/plugins/cabal/cabal.plugin.zsh
 5@@ -1,3 +1,14 @@
 6+function cabal_sandbox_info() {
 7+    cabal_files=(*.cabal(N))
 8+    if [ $#cabal_files -gt 0 ]; then
 9+        if [ -f cabal.sandbox.config ]; then
10+            echo "%{$fg[green]%}sandboxed%{$reset_color%}"
11+        else
12+            echo "%{$fg[red]%}not sandboxed%{$reset_color%}"
13+        fi
14+    fi
15+}
16+
17 function _cabal_commands() {
18     local ret=1 state
19     _arguments ':subcommand:->subcommand' && ret=0
20diff --git a/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh
21index 332497cec05298aae79ea6ec24ef9d37a0afb8ac..be037d87a6603bb5fc5a93442615e56d1d0d4165 100644
22--- a/plugins/gitignore/gitignore.plugin.zsh
23+++ b/plugins/gitignore/gitignore.plugin.zsh
24@@ -1,7 +1,7 @@
25-function gi() { curl http://gitignore.io/api/$@ ;}
26+function gi() { curl http://www.gitignore.io/api/$@ ;}
27 
28 _gitignireio_get_command_list() {
29-  curl -s http://gitignore.io/api/list | tr "," "\n"
30+  curl -s http://www.gitignore.io/api/list | tr "," "\n"
31 }
32 
33 _gitignireio () {
34@@ -9,4 +9,4 @@ _gitignireio () {
35   compadd -S '' `_gitignireio_get_command_list`
36 }
37 
38-compdef _gitignireio gi
39+compdef _gitignireio gi
40diff --git a/plugins/rake/rake.plugin.zsh b/plugins/rake/rake.plugin.zsh
41index 16b933c14c104dc953bed61dbe31ff1570cd0904..121150017fc765e342311c28ba108e63c4f2d719 100644
42--- a/plugins/rake/rake.plugin.zsh
43+++ b/plugins/rake/rake.plugin.zsh
44@@ -1,3 +1,7 @@
45+# Thank you Jim for everything you contributed to the Ruby and open source community 
46+# over the years. We will miss you dearly.
47+alias jimweirich="rake"  
48+
49 alias rake="noglob rake" # allows square brackts for rake task invocation
50 alias brake='noglob bundle exec rake' # execute the bundled rake gem
51 alias srake='noglob sudo rake' # noglob must come before sudo