lib/packaging/util/tool.rb in packaging-0.106.0 vs lib/packaging/util/tool.rb in packaging-0.106.1
- old
+ new
@@ -1,9 +1,8 @@
# Utility methods for handling system binaries
module Pkg::Util::Tool
-
# Set up utility methods for handling system binaries
#
class << self
def check_tool(tool)
find_tool(tool, :required => true)
@@ -13,11 +12,11 @@
ENV['PATH'].split(File::PATH_SEPARATOR).each do |root|
location = File.join(root, tool)
if Pkg::Util::OS.windows? && File.extname(location).empty?
exts = ENV['PATHEXT']
- exts = exts ? exts.split(File::PATH_SEPARATOR) : %w(.EXE .BAT .CMD .COM)
+ exts = exts ? exts.split(File::PATH_SEPARATOR) : %w[.EXE .BAT .CMD .COM]
exts.each do |ext|
locationext = File.expand_path(location + ext)
return '"' + locationext + '"' if FileTest.executable?(locationext)
end
@@ -28,14 +27,12 @@
fail "#{tool} tool not found...exiting" if args[:required]
return nil
end
alias :has_tool :find_tool
-
end
# Set up paths to system tools we use in the packaging repo
# no matter what distribution we're packaging for.
GIT = Pkg::Util::Tool.check_tool('git')
-
end