From e3f082c294862619847a7f5234340b6b69964ff8 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 9 Jun 2014 14:54:49 -0500 Subject: [PATCH] Stop joining symbols to pathnames Ruby 2.2's native Pathname#/ accepts only string-like objects. --- Library/Homebrew/build.rb | 2 +- Library/Homebrew/cmd/uninstall.rb | 2 +- Library/Homebrew/extend/pathname.rb | 2 +- Library/Homebrew/keg.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb index 5054419fb3..f3455d1249 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 d9d13df3ec..9400a3898f 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 018877e84e..d0e77682ca 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 f5d9117c8f..04d8c4c085 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?