mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-12-19 20:29:45 +01:00
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
This commit is contained in:
parent
b64e695b35
commit
c0b094cf85
1 changed files with 2 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue