From 2394a4c4fc56ad008dea175788cdedeb6b5f1bc9 Mon Sep 17 00:00:00 2001 From: Nanda H Krishna Date: Tue, 6 Jul 2021 23:48:26 +0530 Subject: [PATCH] Rename `metadata_master_container_path` to `metadata_main_container_path` --- Library/Homebrew/cask/cask.rb | 4 ++-- Library/Homebrew/cask/installer.rb | 2 +- Library/Homebrew/cask/metadata.rb | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/cask/cask.rb b/Library/Homebrew/cask/cask.rb index caf666397c..cb789407cb 100644 --- a/Library/Homebrew/cask/cask.rb +++ b/Library/Homebrew/cask/cask.rb @@ -102,11 +102,11 @@ module Cask def installed_caskfile 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 def config_path - metadata_master_container_path/"config.json" + metadata_main_container_path/"config.json" end def caskroom_path diff --git a/Library/Homebrew/cask/installer.rb b/Library/Homebrew/cask/installer.rb index f9faefe9cd..ec1a004058 100644 --- a/Library/Homebrew/cask/installer.rb +++ b/Library/Homebrew/cask/installer.rb @@ -538,7 +538,7 @@ module Cask @cask.metadata_versioned_path.rmdir_if_possible end - @cask.metadata_master_container_path.rmdir_if_possible unless upgrade? + @cask.metadata_main_container_path.rmdir_if_possible unless upgrade? # toplevel staged distribution @cask.caskroom_path.rmdir_if_possible unless upgrade? diff --git a/Library/Homebrew/cask/metadata.rb b/Library/Homebrew/cask/metadata.rb index 20e5b8953f..c2db2e2cc0 100644 --- a/Library/Homebrew/cask/metadata.rb +++ b/Library/Homebrew/cask/metadata.rb @@ -9,8 +9,8 @@ module Cask METADATA_SUBDIR = ".metadata" TIMESTAMP_FORMAT = "%Y%m%d%H%M%S.%L" - def metadata_master_container_path - @metadata_master_container_path ||= caskroom_path.join(METADATA_SUBDIR) + def metadata_main_container_path + @metadata_main_container_path ||= caskroom_path.join(METADATA_SUBDIR) end 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? - metadata_master_container_path.join(cask_version) + metadata_main_container_path.join(cask_version) end def metadata_timestamped_path(version: self.version, timestamp: :latest, create: false)