From 95ebefc1ac9f7368eea068a17ebd43534cfafa21 Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Tue, 14 Aug 2018 12:08:41 -0700 Subject: [PATCH] X11Requirement: Recent X11 client is sufficient --- .../Homebrew/requirements/x11_requirement.rb | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/Library/Homebrew/requirements/x11_requirement.rb b/Library/Homebrew/requirements/x11_requirement.rb index 6ffcc2db71..cc7a153e35 100644 --- a/Library/Homebrew/requirements/x11_requirement.rb +++ b/Library/Homebrew/requirements/x11_requirement.rb @@ -27,20 +27,16 @@ class X11Requirement < Requirement satisfy build_env: false do if which_xorg = which("Xorg") - version = Utils.popen_read which_xorg, "-version", err: :out - next false unless $CHILD_STATUS.success? - version = version[/X Server (\d+\.\d+\.\d+)/, 1] - next false unless version - Version.new(version) >= min_version - elsif which_xdpyinfo = which("xdpyinfo") - version = Utils.popen_read which_xdpyinfo, "-version" - next false unless $CHILD_STATUS.success? - version = version[/^xdpyinfo (\d+\.\d+\.\d+)/, 1] - next false unless version - Version.new(version) >= min_xdpyinfo_version - else - false + version = Utils.popen_read(which_xorg, "-version", err: :out)[/X Server (\d+\.\d+\.\d+)/, 1] + next true if $CHILD_STATUS.success? && version && Version.new(version) >= min_version end + + if which_xdpyinfo = which("xdpyinfo") + version = Utils.popen_read(which_xdpyinfo, "-version")[/^xdpyinfo (\d+\.\d+\.\d+)/, 1] + next true if $CHILD_STATUS.success? && version && Version.new(version) >= min_xdpyinfo_version + end + + false end def message