diff options
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/update-reset.sh | 2 | ||||
| -rw-r--r-- | Library/Homebrew/formula_cellar_checks.rb | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/update-reset.sh b/Library/Homebrew/cmd/update-reset.sh index 32daffc96..3a9e1caa9 100644 --- a/Library/Homebrew/cmd/update-reset.sh +++ b/Library/Homebrew/cmd/update-reset.sh @@ -37,7 +37,7 @@ EOS echo echo "==> Resetting $DIR..." - git checkout -B master origin/master + git checkout --force -B master origin/master echo done } diff --git a/Library/Homebrew/formula_cellar_checks.rb b/Library/Homebrew/formula_cellar_checks.rb index 7db5e748b..f72f36c48 100644 --- a/Library/Homebrew/formula_cellar_checks.rb +++ b/Library/Homebrew/formula_cellar_checks.rb @@ -153,6 +153,16 @@ module FormulaCellarChecks EOS end + def check_etc + bad_etc = (formula.prefix/"etc") + return unless bad_etc.directory? + <<-EOS.undent + #{bad_etc} exists! + The contents should instead be installed into: + #{formula.etc} + EOS + end + def audit_installed audit_check_output(check_manpages) audit_check_output(check_infopages) @@ -165,6 +175,7 @@ module FormulaCellarChecks audit_check_output(check_easy_install_pth(formula.lib)) audit_check_output(check_elisp_dirname(formula.share, formula.name)) audit_check_output(check_elisp_root(formula.share, formula.name)) + audit_check_output(check_etc) end alias generic_audit_installed audit_installed |