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

Merge pull request #1502 from reitermarkus/load-metadata-cask-file

Browse Source 
Load cask file in `.metadata` directory directly.
This commit is contained in:
Markus Reiter 2016-11-21 10:43:15 +01:00 committed by GitHub
commit c7267b123d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ module Hbc
"Casks", "#{cask_token}.rb") "Casks", "#{cask_token}.rb")
# use the same cask file that was used for installation, if possible # use the same cask file that was used for installation, if possible
installed_cask = Hbc.load(latest_installed_cask_file) if latest_installed_cask_file.exist? installed_cask = CaskLoader.load_from_file(latest_installed_cask_file) if latest_installed_cask_file.exist?
end end
# Always force uninstallation, ignore method parameter # Always force uninstallation, ignore method parameter

2
Library/Homebrew/cask/lib/hbc/cli/uninstall.rb
View File

@ -20,7 +20,7 @@ module Hbc
"Casks", "#{cask_token}.rb") "Casks", "#{cask_token}.rb")
# use the same cask file that was used for installation, if possible # use the same cask file that was used for installation, if possible
cask = Hbc.load(latest_installed_cask_file) if latest_installed_cask_file.exist? cask = CaskLoader.load_from_file(latest_installed_cask_file) if latest_installed_cask_file.exist?
end end
Installer.new(cask, force: force).uninstall Installer.new(cask, force: force).uninstall