c0b094cf859899bd78db43a4dc59a0ae6786d49d

Author
pangratz <cmueller.418@gmail.com>
Committer
ncanceill <nicolas.canceill@ens-cachan.org>
Date

Message

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

Diff

 1diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
 2index 3338d78bec588a6465a5b6c24518c1184c212bd6..8571eeda3b9ee46ef1983e24816a71c9640a4958 100644
 3--- a/plugins/bundler/bundler.plugin.zsh
 4+++ b/plugins/bundler/bundler.plugin.zsh
 5@@ -3,6 +3,7 @@ alias bl="bundle list"
 6 alias bp="bundle package"
 7 alias bo="bundle open"
 8 alias bu="bundle update"
 9+alias bi="bundle_install"
10 
11 # The following is based on https://github.com/gma/bundler-exec
12 
13@@ -15,7 +16,7 @@ done
14 
15 ## Functions
16 
17-bi() {
18+bundle_install() {
19   if _bundler-installed && _within-bundled-project; then
20     local bundler_version=`bundle version | cut -d' ' -f3`
21     if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then