summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimeon F. Willbanks <sfw@simeonfosterwillbanks.com>2012-12-11 11:17:32 -0800
committerSimeon F. Willbanks <sfw@simeonfosterwillbanks.com>2013-03-27 08:07:24 -0700
commitc89afd2f6a7221152648c7c0e32879dfc98cad5b (patch)
tree7eb631c3260166b42bb025a9b7520a2c13869995
parentb8b241f630377aacefade327c94655cec96b002f (diff)
downloadzsh-c89afd2f6a7221152648c7c0e32879dfc98cad5b.tar.gz
zsh-c89afd2f6a7221152648c7c0e32879dfc98cad5b.tar.bz2
zsh-c89afd2f6a7221152648c7c0e32879dfc98cad5b.zip
Fixes #1485 zeus should not be bundled
-rw-r--r--plugins/bundler/bundler.plugin.zsh2
-rw-r--r--plugins/zeus/zeus.plugin.zsh6
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'