aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Reiter2016-11-06 00:24:31 +0100
committerGitHub2016-11-06 00:24:31 +0100
commit654fa2513baba392bdb244dc22cf6cd13d920f0c (patch)
tree1ee3640ed9212309dec63fc723cca83d2514b34e
parent3cef6a3a78fb9d300b6d7db4cf9a389c1af4ce8b (diff)
parent276864ebd17685edd420b58f00970ebf384bdfc7 (diff)
downloadbrew-654fa2513baba392bdb244dc22cf6cd13d920f0c.tar.bz2
Merge pull request #1445 from MikeMcQuaid/caskroom-prefix
update-report: default Caskroom moved to prefix.
-rw-r--r--Library/Homebrew/cmd/update-report.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
index 72dcc293d..9d096c4cb 100644
--- a/Library/Homebrew/cmd/update-report.rb
+++ b/Library/Homebrew/cmd/update-report.rb
@@ -415,7 +415,7 @@ class Reporter
# This means it is a Cask
if report[:DC].include? full_name
- next unless (HOMEBREW_REPOSITORY/"Caskroom"/name).exist?
+ next unless (HOMEBREW_PREFIX/"Caskroom"/name).exist?
new_tap = Tap.fetch(new_tap_name)
new_tap.install unless new_tap.installed?
ohai "#{name} has been moved to Homebrew.", <<-EOS.undent
@@ -442,7 +442,7 @@ class Reporter
new_tap = Tap.fetch(new_tap_name)
# For formulae migrated to cask: Auto-install cask or provide install instructions.
if new_tap_name == "caskroom/cask"
- if new_tap.installed? && (HOMEBREW_REPOSITORY/"Caskroom").directory?
+ if new_tap.installed? && (HOMEBREW_PREFIX/"Caskroom").directory?
ohai "#{name} has been moved to Homebrew-Cask."
ohai "brew uninstall --force #{name}"
system HOMEBREW_BREW_FILE, "uninstall", "--force", name