mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-12-23 21:01:58 +00:00
Merge pull request #2107 from maxd/master
Check bundler version to avoid error with unsupported command line arguments
This commit is contained in:
commit
8f2e53c33e
1 changed files with 10 additions and 5 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue