diff options
| author | Robby Russell <robby@planetargon.com> | 2013-04-07 18:58:03 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2013-04-07 18:58:03 -0700 |
| commit | ca384067e602ab742d37258816feb6495e24fe90 (patch) | |
| tree | 3e04b75fb9bc0ccec06b52c79b34b084dac29991 /plugins | |
| parent | 77ca980bfa2dbb45e2baf0b3558510bdb1b7a23f (diff) | |
| parent | c89afd2f6a7221152648c7c0e32879dfc98cad5b (diff) | |
| download | zsh-ca384067e602ab742d37258816feb6495e24fe90.tar.gz zsh-ca384067e602ab742d37258816feb6495e24fe90.tar.bz2 zsh-ca384067e602ab742d37258816feb6495e24fe90.zip | |
Merge pull request #1674 from simeonwillbanks/master
Fixes #1485 Zeus should not be bundled
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/bundler/bundler.plugin.zsh | 2 | ||||
| -rw-r--r-- | plugins/zeus/zeus.plugin.zsh | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh index 10c221acd..bc21da134 100644 --- a/plugins/bundler/bundler.plugin.zsh +++ b/plugins/bundler/bundler.plugin.zsh @@ -6,7 +6,7 @@ alias bu="bundle update" # The following is based on https://github.com/gma/bundler-exec -bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails puma zeus) +bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails puma) ## Functions diff --git a/plugins/zeus/zeus.plugin.zsh b/plugins/zeus/zeus.plugin.zsh index 1658b34d3..eddfb4f94 100644 --- a/plugins/zeus/zeus.plugin.zsh +++ b/plugins/zeus/zeus.plugin.zsh @@ -2,12 +2,6 @@ # Zeus preloads your Rails environment and forks that process whenever # needed. This effectively speeds up Rails' boot process to under 1 sec. -# Always use bundler. -# Rails depends on bundler, so we can be pretty sure, that there are no -# problems with this command. For all the other aliases I provided an -# alternative, in case people have conflicts with other plugins (e.g. suse). -alias zeus='bundle exec zeus' - # Init alias zi='zeus init' alias zinit='zeus init' |