diff options
| author | pangratz <cmueller.418@gmail.com> | 2014-02-03 10:35:40 +0100 |
|---|---|---|
| committer | ncanceill <nicolas.canceill@ens-cachan.org> | 2014-05-25 11:15:12 +0200 |
| commit | c0b094cf859899bd78db43a4dc59a0ae6786d49d (patch) | |
| tree | 10c0874ff8db73ec30cc4a8ba56940361178fc0e | |
| parent | b64e695b35db8bf0ff01433669a3adc4ee04341c (diff) | |
| download | zsh-c0b094cf859899bd78db43a4dc59a0ae6786d49d.tar.gz zsh-c0b094cf859899bd78db43a4dc59a0ae6786d49d.tar.bz2 zsh-c0b094cf859899bd78db43a4dc59a0ae6786d49d.zip | |
Fix function/alias naming clash between bower and bundle plugin
Since the `bower` plugin specifies a `bi` alias and `bundle` plugin
specifies a `bi` function, there is a name clash when using both
plugins, which results in the message "Can't 'bundle install' outside a
bundled project" when trying to execute `bower`.
This adresses #2486
| -rw-r--r-- | plugins/bundler/bundler.plugin.zsh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh index 3338d78be..8571eeda3 100644 --- a/plugins/bundler/bundler.plugin.zsh +++ b/plugins/bundler/bundler.plugin.zsh @@ -3,6 +3,7 @@ alias bl="bundle list" alias bp="bundle package" alias bo="bundle open" alias bu="bundle update" +alias bi="bundle_install" # The following is based on https://github.com/gma/bundler-exec @@ -15,7 +16,7 @@ done ## Functions -bi() { +bundle_install() { if _bundler-installed && _within-bundled-project; then local bundler_version=`bundle version | cut -d' ' -f3` if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then |