From 94ed3e358399db37ff88c8a53c6c8cbf7a44e51e Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Tue, 23 May 2017 18:36:06 -0700 Subject: [PATCH] lock: check tools are executable --- Library/Homebrew/utils/lock.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/utils/lock.sh b/Library/Homebrew/utils/lock.sh index 04d8fd1d59..b3c23c3ef3 100644 --- a/Library/Homebrew/utils/lock.sh +++ b/Library/Homebrew/utils/lock.sh @@ -42,13 +42,13 @@ _create_lock() { [[ -x "$ruby" ]] || ruby="$(which ruby 2>/dev/null)" [[ -x "$python" ]] || python="$(which python 2>/dev/null)" - if [[ -n "$ruby" && $("$ruby" -e "puts RUBY_VERSION >= '1.8.7' ? 0 : 1") = 0 ]] + if [[ -x "$ruby" && $("$ruby" -e "puts RUBY_VERSION >= '1.8.7' ? 0 : 1") = 0 ]] then "$ruby" -e "File.new($lock_fd).flock(File::LOCK_EX | File::LOCK_NB) || exit(1)" - elif [[ -n "$(which flock)" ]] + elif [[ -x "$(which flock)" ]] then flock -n "$lock_fd" - elif [[ -n "$python" ]] + elif [[ -x "$python" ]] then "$python" -c "import fcntl; fcntl.flock($lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)" else