From 92e4ebd2ff361071492943f16832ea06039c0997 Mon Sep 17 00:00:00 2001 From: "Keith T. Garner" Date: Tue, 25 Aug 2015 10:20:24 -0500 Subject: [PATCH 1/2] chruby will now ignore lost+found directores within the rubies directories --- share/chruby/chruby.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/share/chruby/chruby.sh b/share/chruby/chruby.sh index c672fe92..8f17a0f9 100644 --- a/share/chruby/chruby.sh +++ b/share/chruby/chruby.sh @@ -2,7 +2,13 @@ CHRUBY_VERSION="0.3.9" RUBIES=() for dir in "$PREFIX/opt/rubies" "$HOME/.rubies"; do - [[ -d "$dir" && -n "$(ls -A "$dir")" ]] && RUBIES+=("$dir"/*) + if [[ -d "$dir" && -n "$(ls -A "$dir")" ]]; then + for rdir in "$dir"/*; do + if [[ "${rdir##*/}" != "lost+found" ]]; then + RUBIES+=("$rdir") + fi + done + fi done unset dir From 701047935313d8962c4799f207268773e1d95896 Mon Sep 17 00:00:00 2001 From: "Keith T. Garner" Date: Tue, 25 Aug 2015 14:03:38 -0500 Subject: [PATCH 2/2] Check ruby existance and then add the path --- share/chruby/chruby.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/share/chruby/chruby.sh b/share/chruby/chruby.sh index 8f17a0f9..48860f77 100644 --- a/share/chruby/chruby.sh +++ b/share/chruby/chruby.sh @@ -4,9 +4,7 @@ RUBIES=() for dir in "$PREFIX/opt/rubies" "$HOME/.rubies"; do if [[ -d "$dir" && -n "$(ls -A "$dir")" ]]; then for rdir in "$dir"/*; do - if [[ "${rdir##*/}" != "lost+found" ]]; then - RUBIES+=("$rdir") - fi + [[ -f "$rdir/bin/ruby" && -x "$rdir/bin/ruby" ]] && RUBIES+=("$rdir") done fi done