diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2019-10-21 16:01:02 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2019-10-21 16:01:02 -0600 |
| commit | 2e9fe98b8a9fe21b982e719e129678dede63771e (patch) | |
| tree | e1dd9634ace0de1c752bddcbc67a998b7d73d40b /plugins/bundler/bundler.plugin.zsh | |
| parent | 112a85697481cae663ff281b74fdc1f72a67b294 (diff) | |
| parent | 534ec60bfd14ee640076c7594ee4fa723fafd1b1 (diff) | |
| download | zsh-2e9fe98b8a9fe21b982e719e129678dede63771e.tar.gz zsh-2e9fe98b8a9fe21b982e719e129678dede63771e.tar.bz2 zsh-2e9fe98b8a9fe21b982e719e129678dede63771e.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/bundler/bundler.plugin.zsh')
| -rw-r--r-- | plugins/bundler/bundler.plugin.zsh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh index c4a4fd40a..665cb5e43 100644 --- a/plugins/bundler/bundler.plugin.zsh +++ b/plugins/bundler/bundler.plugin.zsh @@ -82,7 +82,7 @@ _bundler-installed() { _within-bundled-project() { local check_dir="$PWD" while [ "$check_dir" != "/" ]; do - [ -f "$check_dir/Gemfile" ] && return + [ -f "$check_dir/Gemfile" -o -f "$check_dir/gems.rb" ] && return check_dir="$(dirname $check_dir)" done false @@ -95,7 +95,7 @@ _binstubbed() { _run-with-bundler() { if _bundler-installed && _within-bundled-project; then if _binstubbed $1; then - ./bin/$@ + ./bin/${^^@} else bundle exec $@ fi |