mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-25 23:30:08 +00:00
Merge pull request #2243 from sabarishcrri/bundle_plugin_nobundle_fix
bundle plugin throwing error when bundle is not in path while initializing
This commit is contained in:
commit
a4f4ed037a
1 changed files with 23 additions and 21 deletions
|
@ -4,18 +4,6 @@ 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' ]]
|
|
||||||
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
|
|
||||||
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
|
||||||
|
|
||||||
|
@ -44,14 +32,28 @@ _run-with-bundler() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
## Main program
|
if _bundler-installed; then
|
||||||
for cmd in $bundled_commands; do
|
bundler_version=`bundle version | cut -d' ' -f3`
|
||||||
eval "function unbundled_$cmd () { $cmd \$@ }"
|
if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
|
||||||
eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}"
|
if [[ "$(uname)" == 'Darwin' ]]
|
||||||
alias $cmd=bundled_$cmd
|
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
|
||||||
|
alias bi='bundle install'
|
||||||
|
fi
|
||||||
|
|
||||||
if which _$cmd > /dev/null 2>&1; then
|
## Main program
|
||||||
compdef _$cmd bundled_$cmd=$cmd
|
for cmd in $bundled_commands; do
|
||||||
fi
|
eval "function unbundled_$cmd () { $cmd \$@ }"
|
||||||
done
|
eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}"
|
||||||
|
alias $cmd=bundled_$cmd
|
||||||
|
|
||||||
|
if which _$cmd > /dev/null 2>&1; then
|
||||||
|
compdef _$cmd bundled_$cmd=$cmd
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
Loading…
Reference in a new issue