admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

utils/lock.sh: default to system Ruby if available (#271)

Browse Source 
This avoids weird issues with custom Rubies.

Closes #253.
This commit is contained in:
Mike McQuaid 2016-05-23 14:36:25 +01:00
parent d345483de1
commit 8ecfab8a59
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/utils/lock.sh
View File

@ -26,9 +26,12 @@ EOS
_create_lock() { _create_lock() {
local lock_fd="$1" 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 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)" ]] elif [[ -n "$(which flock)" ]]
then then
flock -n "$lock_fd" flock -n "$lock_fd"