Merge pull request #15009 from apainintheneck/remove-old-prefix-place…

…holder cask: remove old prefix placeholder
Homebrew · Mar 19, 2023 · c5fa3d2 · c5fa3d2
2 parents 96eb047 + 3aae28a
commit c5fa3d2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/Library/Homebrew/cask/cask.rb b/Library/Homebrew/cask/cask.rb
@@ -23,9 +23,6 @@ class Cask
     HOMEBREW_PREFIX_PLACEHOLDER = "$HOMEBREW_PREFIX"
     APPDIR_PLACEHOLDER = "$APPDIR"
 
-    # TODO: can be removed when API JSON is regenerated with HOMEBREW_PREFIX_PLACEHOLDER.
-    HOMEBREW_OLD_PREFIX_PLACEHOLDER = "$(brew --prefix)"
-
     attr_reader :token, :sourcefile_path, :source, :config, :default_config, :loader
     attr_accessor :download, :allow_reassignment
 

diff --git a/Library/Homebrew/cask/cask_loader.rb b/Library/Homebrew/cask/cask_loader.rb
@@ -326,13 +326,10 @@ def load(config:)
       end
 
       def from_h_string_gsubs(string, appdir)
-        # TODO: HOMEBREW_OLD_PREFIX_PLACEHOLDER can be removed when API JSON is
-        #       regenerated with HOMEBREW_PREFIX_PLACEHOLDER.
         string.to_s
               .gsub(Cask::HOME_PLACEHOLDER, Dir.home)
               .gsub(Cask::HOMEBREW_PREFIX_PLACEHOLDER, HOMEBREW_PREFIX)
               .gsub(Cask::APPDIR_PLACEHOLDER, appdir)
-              .gsub(Cask::HOMEBREW_OLD_PREFIX_PLACEHOLDER, HOMEBREW_PREFIX)
       end
 
       def from_h_array_gsubs(array, appdir)