dnrops
/
homebrew-cask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8519 from rolandwalker/x11_detection 

Check for libpng to assure X11 detection
This commit is contained in:
Roland Walker 2014-12-30 16:45:10 -05:00
parent 818f93f066 74b46f7e92
commit 60da9879e6
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/cask/installer.rb
View File

@ -159,7 +159,9 @@ class Cask::Installer
def x11_dependencies def x11_dependencies
return unless @cask.depends_on.x11 return unless @cask.depends_on.x11
raise CaskX11DependencyError.new(@cask.token) unless Cask.x11_executable.exist? if Cask.x11_libpng.select(&:exist?).empty?
raise CaskX11DependencyError.new(@cask.token)
end
end end
def formula_dependencies def formula_dependencies

4
lib/cask/locations.rb
View File

@ -147,5 +147,9 @@ module Cask::Locations
def x11_executable def x11_executable
@x11_executable ||= Pathname.new('/usr/X11/bin/X') @x11_executable ||= Pathname.new('/usr/X11/bin/X')
end end
def x11_libpng
@x11_libpng ||= [ Pathname.new('/opt/X11/lib/libpng.dylib'), Pathname.new('/usr/X11/lib/libpng.dylib') ]
end
end end
end end

2
test/cask/depends_on_test.rb
View File

@ -101,7 +101,7 @@ describe "Satisfy Dependencies and Requirements" do
it "raises an exception when depends_on :x11 is not satisfied" do it "raises an exception when depends_on :x11 is not satisfied" do
x11_cask = Cask.load('with-depends-on-x11') x11_cask = Cask.load('with-depends-on-x11')
Cask.stubs(:x11_executable).returns(Pathname.new('/usr/path/does/not/exist')) Cask.stubs(:x11_libpng).returns([Pathname.new('/usr/path/does/not/exist')])
lambda { lambda {
shutup do shutup do
Cask::Installer.new(x11_cask).install Cask::Installer.new(x11_cask).install