Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DSL: remove arch_only caveats support #7810

Merged
merged 1 commit into from
Dec 6, 2014
Merged

DSL: remove arch_only caveats support #7810

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions lib/cask/caveats.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,32 +107,6 @@ def assistive_devices
EOS
end

# minor bug: because output from arch_only is conditional, the
# existence of this directive causes "===> Caveats" header to
# appear even if no warning is output. One workaround would
# be to spin out arch-detection from caveats into a separate
# Cask stanza, and that is probably a sensible design.
def arch_only(*supported_arches)
known_arches = %w{intel-64 intel-32}
supported_arches.each do |arch|
unless known_arches.include?(arch)
raise CaskInvalidError.new(@cask, "The only valid arguments to caveats arch_only are: #{known_arches.utf8_inspect}")
end
end
this_arch = "#{Hardware::CPU.type}-#{Hardware::CPU.bits}"
unless supported_arches.include?(this_arch)
puts <<-EOS.undent
Cask #{@cask} provides binaries for these architectures: #{supported_arches.utf8_inspect}.
But you appear to be running on an unsupported architecture:

#{this_arch}

Therefore #{@cask} is not expected to work on your system.

EOS
end
end

def x11_required
unless File.exist?('/usr/X11/bin/X')
puts <<-EOS.undent
Expand Down