@@ -13,12 +13,21 @@ type _completion_ruby_init &>/dev/null && return 1 _CR_PATH=$(dirname "$BASH_ARGV") +# _cr_anycmd <command> [command...] +# Returns success if any of the given commands is found, nonzero if +# none of them exists. +_cr_anycmd() { + for cmd in "$@"; do + type -- "$cmd" &>/dev/null && return + done + return 1 +} # _cr_load <script> [additional commands] # Sources completion-<script>, if the file exists and either <script> or # any of the additional parameters names an existing command. _cr_load() { local script=$_CR_PATH/completion-$1 - [[ -f $script ]] && type "$@" &>/dev/null && . "$script" + [[ -f $script ]] && _cr_anycmd "$@" && . "$script" } _cr_load gem gem1.8 gem1.9 jgem @@ -27,7 +36,7 @@ _cr_load rails _cr_load rake _cr_load ruby ruby1.8 ruby1.9 -unset -f _cr_load +unset -f _cr_load _cr_anycmd unset -v _CR_PATH # vim: ai ft=sh sw=2 sts=2 et completion-ruby-all 6f99f4f3882d2b3e78f6d8168ba0e1e26d4f99c2 Daniel Luz dev@mernen.com http://github.com/mernen/completion-ruby/commit/eacb02db57f6a7d19534b035f5e610414f8bb330 eacb02db57f6a7d19534b035f5e610414f8bb330 2009-09-17T12:15:29-07:00 2009-09-17T12:15:29-07:00 Fixed completions not loading if you don't have all of the possible commands available 5d1c2008b9a4464527e82f3edddea177c6c9fe6f Daniel Luz dev@mernen.com