Fix Installer not supporting plain executables.

This commit is contained in:
Markus Reiter 2018-07-11 16:39:17 +02:00
parent 05cb6cda08
commit 20ec595cb2
2 changed files with 25 additions and 10 deletions

View File

@ -14,16 +14,32 @@ module Hbc
To complete the installation of Cask #{cask}, you must also
run the installer at
'#{path}'
'#{cask.staged_path.join(path)}'
EOS
end
end
module ScriptInstaller
def install_phase(command: nil, **_)
ohai "Running #{self.class.dsl_key} script '#{path.relative_path_from(cask.staged_path)}'"
FileUtils.chmod "+x", path unless path.executable?
command.run!(path, **args, env: { "PATH" => PATH.new(HOMEBREW_PREFIX/"bin", HOMEBREW_PREFIX/"sbin", ENV["PATH"]) })
ohai "Running #{self.class.dsl_key} script '#{path}'"
absolute_path = if path.absolute?
path
else
cask.staged_path.join(path)
end
if absolute_path.exist? && !absolute_path.executable?
FileUtils.chmod "+x", absolute_path
end
executable = if absolute_path.exist?
absolute_path
else
path
end
command.run!(executable, **args, env: { "PATH" => PATH.new(HOMEBREW_PREFIX/"bin", HOMEBREW_PREFIX/"sbin", ENV["PATH"]) })
end
end
@ -54,7 +70,7 @@ module Hbc
super(cask)
if args.key?(:manual)
@path = cask.staged_path.join(args[:manual])
@path = Pathname(args[:manual])
@args = []
extend(ManualInstaller)
return
@ -65,17 +81,16 @@ module Hbc
)
raise CaskInvalidError.new(cask, "#{self.class.dsl_key} missing executable") if path.nil?
path = Pathname(path)
@path = path.absolute? ? path : cask.staged_path.join(path)
@path = Pathname(path)
extend(ScriptInstaller)
end
def summarize
path.relative_path_from(cask.staged_path).to_s
path.to_s
end
def to_h
{ path: path.relative_path_from(cask.staged_path).to_s }.tap do |h|
{ path: path }.tap do |h|
h[:args] = args unless is_a?(ManualInstaller)
end
end

View File

@ -520,7 +520,7 @@ describe Hbc::DSL, :cask do
it "allows installer manual to be specified" do
installer = cask.artifacts.first
expect(installer).to be_a(Hbc::Artifact::Installer::ManualInstaller)
expect(installer.path).to eq(cask.staged_path.join("Caffeine.app"))
expect(installer.path).to eq(Pathname("Caffeine.app"))
end
end
end