aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2014-06-09 14:54:49 -0500
committerJack Nagel2014-06-09 14:57:21 -0500
commite3f082c294862619847a7f5234340b6b69964ff8 (patch)
treed7bbaa5aeedb804eaa118de5c56c0729a27150e2 /Library
parent974b7e71ef11a09f188f0f5e40d609c0732b3406 (diff)
downloadbrew-e3f082c294862619847a7f5234340b6b69964ff8.tar.bz2
Stop joining symbols to pathnames
Ruby 2.2's native Pathname#/ accepts only string-like objects.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/build.rb2
-rw-r--r--Library/Homebrew/cmd/uninstall.rb2
-rw-r--r--Library/Homebrew/extend/pathname.rb2
-rw-r--r--Library/Homebrew/keg.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb
index 5054419fb..f3455d124 100644
--- a/Library/Homebrew/build.rb
+++ b/Library/Homebrew/build.rb
@@ -117,7 +117,7 @@ class Build
ENV.activate_extensions!
deps.map(&:to_formula).each do |dep|
- opt = HOMEBREW_PREFIX/:opt/dep
+ opt = HOMEBREW_PREFIX.join("opt", dep.name)
fixopt(dep) unless opt.directory?
end
diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb
index d9d13df3e..9400a3898 100644
--- a/Library/Homebrew/cmd/uninstall.rb
+++ b/Library/Homebrew/cmd/uninstall.rb
@@ -36,7 +36,7 @@ module Homebrew extend self
end
def rm_opt_link name
- optlink = HOMEBREW_PREFIX/:opt/name
+ optlink = HOMEBREW_PREFIX.join("opt", name)
optlink.unlink if optlink.symlink?
end
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index 018877e84..d0e77682c 100644
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@@ -321,7 +321,7 @@ class Pathname
end
def find_formula
- [self/:Formula, self/:HomebrewFormula, self].each do |d|
+ [join("Formula"), join("HomebrewFormula"), self].each do |d|
if d.exist?
d.children.each do |pn|
yield pn if pn.extname == ".rb"
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index f5d9117c8..04d8c4c08 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -248,7 +248,7 @@ class Keg < Pathname
end
def optlink
- from = HOMEBREW_PREFIX/:opt/fname
+ from = HOMEBREW_PREFIX.join("opt", fname)
if from.symlink?
from.delete
elsif from.directory?