adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2107 from maxd/master

Browse Source 
Check bundler version to avoid error with unsupported command line arguments
This commit is contained in:
Robby Russell 2013-10-24 13:13:10 -07:00
commit 8f2e53c33e
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/bundler/bundler.plugin.zsh
View File

@ -4,6 +4,8 @@ alias bp="bundle package"
alias bo="bundle open" alias bo="bundle open"
alias bu="bundle update" alias bu="bundle update"
bundler_version=`bundle version | cut -d' ' -f3`
if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
if [[ "$(uname)" == 'Darwin' ]] if [[ "$(uname)" == 'Darwin' ]]
then then
local cores_num="$(sysctl hw.ncpu | awk '{print $2}')" local cores_num="$(sysctl hw.ncpu | awk '{print $2}')"
@ -11,6 +13,9 @@ else
local cores_num="$(nproc)" local cores_num="$(nproc)"
fi fi
eval "alias bi='bundle install --jobs=$cores_num'" eval "alias bi='bundle install --jobs=$cores_num'"
else
alias bi='bundle install'
fi
# The following is based on https://github.com/gma/bundler-exec # The following is based on https://github.com/gma/bundler-exec