diff options
| author | Robby Russell <robby@planetargon.com> | 2014-02-25 20:27:51 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-02-25 20:27:51 -0800 |
| commit | 6b3c9537754b4a2180648258341ae2d7ca203d1e (patch) | |
| tree | 93ff44d4df1d83ac3c3f14637e771c37b23c9c7b | |
| parent | 6cc240811fd5756a7e2fd1a79ac529ca5f284e1d (diff) | |
| parent | 74ad998ad0c9452814cbc38e3efc7c0670b7496a (diff) | |
| download | zsh-6b3c9537754b4a2180648258341ae2d7ca203d1e.tar.gz zsh-6b3c9537754b4a2180648258341ae2d7ca203d1e.tar.bz2 zsh-6b3c9537754b4a2180648258341ae2d7ca203d1e.zip | |
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
| -rw-r--r-- | plugins/cabal/cabal.plugin.zsh | 11 | ||||
| -rw-r--r-- | plugins/gitignore/gitignore.plugin.zsh | 6 | ||||
| -rw-r--r-- | plugins/rake/rake.plugin.zsh | 4 |
3 files changed, 18 insertions, 3 deletions
diff --git a/plugins/cabal/cabal.plugin.zsh b/plugins/cabal/cabal.plugin.zsh index 8d3c64587..9f76add7a 100644 --- a/plugins/cabal/cabal.plugin.zsh +++ b/plugins/cabal/cabal.plugin.zsh @@ -1,3 +1,14 @@ +function cabal_sandbox_info() { + cabal_files=(*.cabal(N)) + if [ $#cabal_files -gt 0 ]; then + if [ -f cabal.sandbox.config ]; then + echo "%{$fg[green]%}sandboxed%{$reset_color%}" + else + echo "%{$fg[red]%}not sandboxed%{$reset_color%}" + fi + fi +} + function _cabal_commands() { local ret=1 state _arguments ':subcommand:->subcommand' && ret=0 diff --git a/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh index 332497cec..be037d87a 100644 --- a/plugins/gitignore/gitignore.plugin.zsh +++ b/plugins/gitignore/gitignore.plugin.zsh @@ -1,7 +1,7 @@ -function gi() { curl http://gitignore.io/api/$@ ;} +function gi() { curl http://www.gitignore.io/api/$@ ;} _gitignireio_get_command_list() { - curl -s http://gitignore.io/api/list | tr "," "\n" + curl -s http://www.gitignore.io/api/list | tr "," "\n" } _gitignireio () { @@ -9,4 +9,4 @@ _gitignireio () { compadd -S '' `_gitignireio_get_command_list` } -compdef _gitignireio gi
\ No newline at end of file +compdef _gitignireio gi diff --git a/plugins/rake/rake.plugin.zsh b/plugins/rake/rake.plugin.zsh index 16b933c14..121150017 100644 --- a/plugins/rake/rake.plugin.zsh +++ b/plugins/rake/rake.plugin.zsh @@ -1,3 +1,7 @@ +# Thank you Jim for everything you contributed to the Ruby and open source community +# over the years. We will miss you dearly. +alias jimweirich="rake" + alias rake="noglob rake" # allows square brackts for rake task invocation alias brake='noglob bundle exec rake' # execute the bundled rake gem alias srake='noglob sudo rake' # noglob must come before sudo |