aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Reiter2017-03-06 21:28:17 +0100
committerMarkus Reiter2017-03-06 21:30:06 +0100
commitb2359873d032615ccfef0ef07b4cc01996dee0be (patch)
tree0bd2062e91246ef4d4245fd43129c1c80bfacd9c
parent1959cc3f2df6287467d90242fc6dee41398a5731 (diff)
downloadbrew-b2359873d032615ccfef0ef07b4cc01996dee0be.tar.bz2
Move `legacy_cache` outside of `Locations`.
-rw-r--r--Library/Homebrew/cask/lib/hbc/cache.rb7
-rw-r--r--Library/Homebrew/cask/lib/hbc/locations.rb4
2 files changed, 4 insertions, 7 deletions
diff --git a/Library/Homebrew/cask/lib/hbc/cache.rb b/Library/Homebrew/cask/lib/hbc/cache.rb
index 7b586528e..4e99fdd4f 100644
--- a/Library/Homebrew/cask/lib/hbc/cache.rb
+++ b/Library/Homebrew/cask/lib/hbc/cache.rb
@@ -10,10 +10,11 @@ module Hbc
end
def delete_legacy_cache
- return unless Hbc.legacy_cache.exist?
+ legacy_cache = HOMEBREW_CACHE.join("Casks")
+ return unless legacy_cache.exist?
- ohai "Deleting legacy cache at #{Hbc.legacy_cache}..."
- FileUtils.remove_entry_secure(Hbc.legacy_cache)
+ ohai "Deleting legacy cache at #{legacy_cache}..."
+ FileUtils.remove_entry_secure(legacy_cache)
end
end
end
diff --git a/Library/Homebrew/cask/lib/hbc/locations.rb b/Library/Homebrew/cask/lib/hbc/locations.rb
index 4fb4a2191..7a0f93851 100644
--- a/Library/Homebrew/cask/lib/hbc/locations.rb
+++ b/Library/Homebrew/cask/lib/hbc/locations.rb
@@ -38,10 +38,6 @@ module Hbc
end
end
- def legacy_cache
- @legacy_cache ||= HOMEBREW_CACHE.join("Casks")
- end
-
attr_writer :cache
def cache