Commit c0b094cf authored by pangratz's avatar pangratz Committed by ncanceill
Browse files

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
parent b64e695b
...@@ -3,6 +3,7 @@ alias bl="bundle list" ...@@ -3,6 +3,7 @@ alias bl="bundle list"
alias bp="bundle package" alias bp="bundle package"
alias bo="bundle open" alias bo="bundle open"
alias bu="bundle update" alias bu="bundle update"
alias bi="bundle_install"
# The following is based on https://github.com/gma/bundler-exec # The following is based on https://github.com/gma/bundler-exec
...@@ -15,7 +16,7 @@ done ...@@ -15,7 +16,7 @@ done
## Functions ## Functions
bi() { bundle_install() {
if _bundler-installed && _within-bundled-project; then if _bundler-installed && _within-bundled-project; then
local bundler_version=`bundle version | cut -d' ' -f3` local bundler_version=`bundle version | cut -d' ' -f3`
if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment