admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #1445 from MikeMcQuaid/caskroom-prefix

Browse Source 
update-report: default Caskroom moved to prefix.
This commit is contained in:
Markus Reiter 2016-11-06 00:24:31 +01:00 committed by GitHub
commit 654fa2513b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cmd/update-report.rb
View File

@ -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