admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #2328 from reitermarkus/installed-caskfile

Browse Source 
Add `#installed_caskfile` method to `Cask` class.
This commit is contained in:
Markus Reiter 2017-03-12 22:24:45 +01:00 committed by GitHub
commit ad7c2e5416
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/cask/lib/hbc/cask.rb
View File

@ -84,6 +84,11 @@ module Hbc
!versions.empty?
end
def installed_caskfile
installed_version = timestamped_versions.last
metadata_master_container_path.join(*installed_version, "Casks", "#{token}.rb")
end
def to_s
@token
end

3
Library/Homebrew/cask/lib/hbc/cli/list.rb
View File

@ -36,8 +36,7 @@ module Hbc
elsif @options[:versions]
puts format_versioned(cask)
else
installed_caskfile = cask.metadata_master_container_path.join(*cask.timestamped_versions.last, "Casks", "#{cask_token}.rb")
cask = Hbc.load(installed_caskfile)
cask = CaskLoader.load_from_file(cask.installed_caskfile)
list_artifacts(cask)
end

12
Library/Homebrew/cask/lib/hbc/cli/reinstall.rb
View File

@ -17,16 +17,10 @@ module Hbc
if cask.installed?
# use copy of cask for uninstallation to avoid 'No such file or directory' bug
installed_cask = cask
latest_installed_version = installed_cask.timestamped_versions.last
unless latest_installed_version.nil?
latest_installed_cask_file = installed_cask.metadata_master_container_path
.join(latest_installed_version
.join(File::Separator),
"Casks", "#{cask_token}.rb")
# use the same cask file that was used for installation, if possible
installed_cask = CaskLoader.load_from_file(latest_installed_cask_file) if latest_installed_cask_file.exist?
# use the same cask file that was used for installation, if possible
if (installed_caskfile = installed_cask.installed_caskfile).exist?
installed_cask = CaskLoader.load_from_file(installed_caskfile)
end
# Always force uninstallation, ignore method parameter