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

Rename metadata_master_container_path to metadata_main_container_path

Browse Source
This commit is contained in:
Nanda H Krishna 2021-07-06 23:48:26 +05:30
parent 5ccfbcd1d2
commit 2394a4c4fc
No known key found for this signature in database
GPG Key ID: 067E5FCD58ADF3AA
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cask/cask.rb
View File

@ -102,11 +102,11 @@ module Cask
def installed_caskfile def installed_caskfile
installed_version = timestamped_versions.last installed_version = timestamped_versions.last
metadata_master_container_path.join(*installed_version, "Casks", "#{token}.rb") metadata_main_container_path.join(*installed_version, "Casks", "#{token}.rb")
end end
def config_path def config_path
metadata_master_container_path/"config.json" metadata_main_container_path/"config.json"
end end
def caskroom_path def caskroom_path

2
Library/Homebrew/cask/installer.rb
View File

@ -538,7 +538,7 @@ module Cask
@cask.metadata_versioned_path.rmdir_if_possible @cask.metadata_versioned_path.rmdir_if_possible
end end
@cask.metadata_master_container_path.rmdir_if_possible unless upgrade? @cask.metadata_main_container_path.rmdir_if_possible unless upgrade?
# toplevel staged distribution # toplevel staged distribution
@cask.caskroom_path.rmdir_if_possible unless upgrade? @cask.caskroom_path.rmdir_if_possible unless upgrade?

6
Library/Homebrew/cask/metadata.rb
View File

@ -9,8 +9,8 @@ module Cask
METADATA_SUBDIR = ".metadata" METADATA_SUBDIR = ".metadata"
TIMESTAMP_FORMAT = "%Y%m%d%H%M%S.%L" TIMESTAMP_FORMAT = "%Y%m%d%H%M%S.%L"
def metadata_master_container_path def metadata_main_container_path
@metadata_master_container_path ||= caskroom_path.join(METADATA_SUBDIR) @metadata_main_container_path ||= caskroom_path.join(METADATA_SUBDIR)
end end
def metadata_versioned_path(version: self.version) def metadata_versioned_path(version: self.version)
@ -18,7 +18,7 @@ module Cask
raise CaskError, "Cannot create metadata path with empty version." if cask_version.empty? raise CaskError, "Cannot create metadata path with empty version." if cask_version.empty?
metadata_master_container_path.join(cask_version) metadata_main_container_path.join(cask_version)
end end
def metadata_timestamped_path(version: self.version, timestamp: :latest, create: false) def metadata_timestamped_path(version: self.version, timestamp: :latest, create: false)