diff options
| author | Maxim Dobryakov <mdobryakov@spbtv.com> | 2013-09-24 13:58:48 +0400 |
|---|---|---|
| committer | Maxim Dobryakov <mdobryakov@spbtv.com> | 2013-09-24 13:58:48 +0400 |
| commit | e8c3619486289fc21158ecd63d7fd91e3576c75c (patch) | |
| tree | dba4cf51a6ae56084c842ffd0bfec823e1595e73 | |
| parent | 61e3951e4be2f496d8ce8022afc58817c06e5dee (diff) | |
| download | zsh-e8c3619486289fc21158ecd63d7fd91e3576c75c.tar.gz zsh-e8c3619486289fc21158ecd63d7fd91e3576c75c.tar.bz2 zsh-e8c3619486289fc21158ecd63d7fd91e3576c75c.zip | |
Check bundler version to avoid error with unsupported command line arguments
| -rw-r--r-- | plugins/bundler/bundler.plugin.zsh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh index 5bd28cbdc..2e657e5a8 100644 --- a/plugins/bundler/bundler.plugin.zsh +++ b/plugins/bundler/bundler.plugin.zsh @@ -4,13 +4,18 @@ alias bp="bundle package" alias bo="bundle open" alias bu="bundle update" -if [[ "$(uname)" == 'Darwin' ]] -then - local cores_num="$(sysctl hw.ncpu | awk '{print $2}')" +bundler_version=`bundle version | cut -d' ' -f3` +if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then + if [[ "$(uname)" == 'Darwin' ]] + then + local cores_num="$(sysctl hw.ncpu | awk '{print $2}')" + else + local cores_num="$(nproc)" + fi + eval "alias bi='bundle install --jobs=$cores_num'" else - local cores_num="$(nproc)" + alias bi='bundle install' fi -eval "alias bi='bundle install --jobs=$cores_num'" # The following is based on https://github.com/gma/bundler-exec |