From 8ecfab8a598be15e7aa66e334b0ff92700943d1d Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 23 May 2016 14:36:25 +0100 Subject: [PATCH] utils/lock.sh: default to system Ruby if available (#271) This avoids weird issues with custom Rubies. Closes #253. --- Library/Homebrew/utils/lock.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/utils/lock.sh b/Library/Homebrew/utils/lock.sh index 97cf282192..b8e3f61ad3 100644 --- a/Library/Homebrew/utils/lock.sh +++ b/Library/Homebrew/utils/lock.sh @@ -26,9 +26,12 @@ EOS _create_lock() { local lock_fd="$1" - if [[ -n "$(which ruby)" ]] + local ruby="/usr/bin/ruby" + [[ -x "$ruby" ]] || local ruby="$(which ruby 2>/dev/null)" + + if [[ -n "$ruby" ]] then - ruby -e "File.new($lock_fd).flock(File::LOCK_EX | File::LOCK_NB) || exit(1)" + "$ruby" -e "File.new($lock_fd).flock(File::LOCK_EX | File::LOCK_NB) || exit(1)" elif [[ -n "$(which flock)" ]] then flock -n "$lock_fd"