aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorSimon Sigurdhsson2013-04-21 10:44:24 +0200
committerJack Nagel2013-04-21 23:48:50 -0500
commit4f45077fdee34243f2506ce6328a6d16f8330019 (patch)
tree58d506cd898e006a5c5850bea208060d30cb1f99 /Library
parent9234a82a7b28cdf67b27f59aaad35ea8a71de59c (diff)
downloadbrew-4f45077fdee34243f2506ce6328a6d16f8330019.tar.bz2
Remove global methods from formulae
Removes any global methods from formulae, and moves #kext_prefix (which seems to be at least somewhat abstractable) into the Formula class. The only formula with global methods is now aspell; it (and its generating script in contrib) has been changed to prefix that method with `aspell_`, to minimize the risk of name collisions. Closes Homebrew/homebrew#19331. Closes Homebrew/homebrew#19343. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
-rwxr-xr-xLibrary/Contributions/cmd/brew-aspell-dictionaries2
-rw-r--r--Library/Homebrew/formula.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/Library/Contributions/cmd/brew-aspell-dictionaries b/Library/Contributions/cmd/brew-aspell-dictionaries
index a5cdb1ac3..61a5e085e 100755
--- a/Library/Contributions/cmd/brew-aspell-dictionaries
+++ b/Library/Contributions/cmd/brew-aspell-dictionaries
@@ -40,7 +40,7 @@ EOF
done
cat <<EOF >> $brew_formulae_tmp_file
-def available_languages
+def aspell_available_languages
%w(${langs})
end
# END generated with `basename $0`
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 778a9a688..1eb95c273 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -165,6 +165,8 @@ class Formula
def sbin; prefix+'sbin' end
def share; prefix+'share' end
+ def kext_prefix; prefix+'Library/Extensions' end
+
# configuration needs to be preserved past upgrades
def etc; HOMEBREW_PREFIX+'etc' end
# generally we don't want var stuff inside the keg