diff options
| author | Markus Reiter | 2016-09-19 19:07:55 +0200 |
|---|---|---|
| committer | GitHub | 2016-09-19 19:07:55 +0200 |
| commit | e22610aedd550cb5577dd08cedb7a5609d0ff0b8 (patch) | |
| tree | f4e87c725d7e6b032f5b042f15d0aeeba00696ad /Library/Homebrew/cmd | |
| parent | 3ffb9a2f7cda6652f75cb0c59c6d079ab1039e94 (diff) | |
| parent | c0cc703516c1c32d42922dbb2af17c09fc340825 (diff) | |
| download | brew-e22610aedd550cb5577dd08cedb7a5609d0ff0b8.tar.bz2 | |
Merge pull request #1025 from reitermarkus/migrate-caskroom
Make `HOMEBREW_PREFIX/Caskroom` the default.
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/update-report.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index f6e73c2eb..c37a181c9 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -231,12 +231,8 @@ module Homebrew FileUtils.cp_r "#{HOMEBREW_REPOSITORY}/Library/Taps", "#{new_homebrew_repository}/Library/Taps" end - if (HOMEBREW_REPOSITORY/"Caskroom").exist? - FileUtils.cp_r "#{HOMEBREW_REPOSITORY}/Caskroom", "#{new_homebrew_repository}/Caskroom" - end - unremovable_paths = [] - extra_remove_paths = [".git", "Library/Locks", "Library/Taps", "Caskroom", + extra_remove_paths = [".git", "Library/Locks", "Library/Taps", "Library/Homebrew/cask", "Library/Homebrew/test"] (repo_files + extra_remove_paths).each do |file| path = Pathname.new "#{HOMEBREW_REPOSITORY}/#{file}" |