From 2ff114bc32ce677ed133ea805e4686214aaf8153 Mon Sep 17 00:00:00 2001
From: L. E. Segovia
Date: Tue, 28 Nov 2017 14:29:53 +0000
Subject: Use the proper path when purging metadata

---
 Library/Homebrew/cask/lib/hbc/installer.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/cask/lib/hbc/installer.rb b/Library/Homebrew/cask/lib/hbc/installer.rb
index 3dd2a7990..30d5f30be 100644
--- a/Library/Homebrew/cask/lib/hbc/installer.rb
+++ b/Library/Homebrew/cask/lib/hbc/installer.rb
@@ -452,7 +452,7 @@ module Hbc
       ohai "Purging files for version #{@cask.version} of Cask #{@cask}"
 
       # versioned staged distribution
-      if version_is_latest?
+      if upgrade? && version_is_latest?
         staged_path = backup_path(@cask.staged_path)
       else
         staged_path = @cask.staged_path
@@ -463,7 +463,7 @@ module Hbc
       # Homebrew-Cask metadata
       if @cask.metadata_versioned_path.respond_to?(:children) &&
          @cask.metadata_versioned_path.exist? &&
-         !version_is_latest?
+         !(upgrade? && version_is_latest?)
         @cask.metadata_versioned_path.children.each do |subdir|
           unless PERSISTENT_METADATA_SUBDIRS.include?(subdir.basename)
             gain_permissions_remove(subdir)
-- 
cgit v1.2.3