Fix incorrect error message when running bi without having bundler installed (#7112)

This commit is contained in:
Iulian Onofrei 2018-09-09 01:39:23 +03:00 committed by Marc Cornellà
parent f75d096c1a
commit 08a2808636

View File

@ -54,8 +54,12 @@ done
## Functions ## Functions
bundle_install() { bundle_install() {
if _bundler-installed && _within-bundled-project; then if ! _bundler-installed; then
local bundler_version=`bundle --version | cut -d' ' -f3` echo "Bundler is not installed"
elif ! _within-bundled-project; then
echo "Can't 'bundle install' outside a bundled project"
else
local bundler_version=`bundle version | cut -d' ' -f3`
if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
if [[ "$OSTYPE" = (darwin|freebsd)* ]] if [[ "$OSTYPE" = (darwin|freebsd)* ]]
then then
@ -67,8 +71,6 @@ bundle_install() {
else else
bundle install $@ bundle install $@
fi fi
else
echo "Can't 'bundle install' outside a bundled project"
fi fi
} }