aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Vandenberg2010-12-31 11:00:15 -0800
committerAdam Vandenberg2011-03-12 11:55:07 -0800
commit05d175d51f35848a873f45e97e32020bf10595a7 (patch)
tree42b6edb0b7d78e7b1ae7de0faab169f2e2f78bbf
parent8ace9f0294ad488bf7236b9d4fb206244a09c445 (diff)
downloadhomebrew-05d175d51f35848a873f45e97e32020bf10595a7.tar.bz2
Use + instead of /.
-rw-r--r--Library/Homebrew/cmd/--cellar.rb2
-rw-r--r--Library/Homebrew/cmd/diy.rb2
-rw-r--r--Library/Homebrew/cmd/edit.rb10
-rw-r--r--Library/Homebrew/cmd/info.rb2
-rw-r--r--Library/Homebrew/cmd/list.rb2
-rw-r--r--Library/Homebrew/cmd/prune.rb2
-rw-r--r--Library/Homebrew/cmd/search.rb2
-rw-r--r--Library/Homebrew/compatibility.rb2
-rw-r--r--Library/Homebrew/extend/ARGV.rb2
-rw-r--r--Library/Homebrew/formula.rb6
-rw-r--r--Library/Homebrew/global.rb6
-rwxr-xr-xLibrary/Homebrew/install.rb2
12 files changed, 20 insertions, 20 deletions
diff --git a/Library/Homebrew/cmd/--cellar.rb b/Library/Homebrew/cmd/--cellar.rb
index c7e140dc5..aab2cc7b0 100644
--- a/Library/Homebrew/cmd/--cellar.rb
+++ b/Library/Homebrew/cmd/--cellar.rb
@@ -3,7 +3,7 @@ module Homebrew extend self
if ARGV.named.empty?
puts HOMEBREW_CELLAR
else
- puts ARGV.formulae.map{ |f| HOMEBREW_CELLAR/f }
+ puts ARGV.formulae.map{ |f| HOMEBREW_CELLAR+f }
end
end
end
diff --git a/Library/Homebrew/cmd/diy.rb b/Library/Homebrew/cmd/diy.rb
index 174626afc..2e71f8890 100644
--- a/Library/Homebrew/cmd/diy.rb
+++ b/Library/Homebrew/cmd/diy.rb
@@ -21,7 +21,7 @@ module Homebrew extend self
end
end
- prefix = HOMEBREW_CELLAR/name/version
+ prefix = HOMEBREW_CELLAR+name+version
if File.file? 'CMakeLists.txt'
puts "-DCMAKE_INSTALL_PREFIX=#{prefix}"
diff --git a/Library/Homebrew/cmd/edit.rb b/Library/Homebrew/cmd/edit.rb
index 6ab91dccf..079f561a0 100644
--- a/Library/Homebrew/cmd/edit.rb
+++ b/Library/Homebrew/cmd/edit.rb
@@ -6,14 +6,14 @@ module Homebrew extend self
# EDITOR isn't a good fit here, we need a GUI client that actually has
# a UI for projects, so apologies if this wasn't what you expected,
# please improve it! :)
- exec 'mate', HOMEBREW_REPOSITORY/"bin/brew",
- HOMEBREW_REPOSITORY/'README.md',
- HOMEBREW_REPOSITORY/".gitignore",
- *Dir[HOMEBREW_REPOSITORY/"Library/*"]
+ exec 'mate', HOMEBREW_REPOSITORY+"bin/brew",
+ HOMEBREW_REPOSITORY+'README.md',
+ HOMEBREW_REPOSITORY+".gitignore",
+ *Dir[HOMEBREW_REPOSITORY+"Library/*"]
else
# Don't use ARGV.formulae as that will throw if the file doesn't parse
paths = ARGV.named.map do |name|
- HOMEBREW_REPOSITORY/"Library/Formula/#{Formula.caniconical_name name}.rb"
+ HOMEBREW_REPOSITORY+"Library/Formula/#{Formula.caniconical_name name}.rb"
end
unless ARGV.force?
paths.each do |path|
diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb
index 7f9767e07..89b9e900e 100644
--- a/Library/Homebrew/cmd/info.rb
+++ b/Library/Homebrew/cmd/info.rb
@@ -74,7 +74,7 @@ module Homebrew extend self
rescue FormulaUnavailableError
# check for DIY installation
- d = HOMEBREW_PREFIX/name
+ d = HOMEBREW_PREFIX+name
if d.directory?
ohai "DIY Installation"
d.children.each{ |keg| puts "#{keg} (#{keg.abv})" }
diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb
index 8e35530fd..edd5326b5 100644
--- a/Library/Homebrew/cmd/list.rb
+++ b/Library/Homebrew/cmd/list.rb
@@ -9,7 +9,7 @@ module Homebrew extend self
if ARGV.named.empty?
HOMEBREW_CELLAR.children.select{ |pn| pn.directory? }
else
- ARGV.named.map{ |n| HOMEBREW_CELLAR/n }.select{ |pn| pn.exist? }
+ ARGV.named.map{ |n| HOMEBREW_CELLAR+n }.select{ |pn| pn.exist? }
end.each do |d|
versions = d.children.select{ |pn| pn.directory? }.map{ |pn| pn.basename.to_s }
puts "#{d.basename} #{versions*' '}"
diff --git a/Library/Homebrew/cmd/prune.rb b/Library/Homebrew/cmd/prune.rb
index ba4bbc8e5..e694f31f5 100644
--- a/Library/Homebrew/cmd/prune.rb
+++ b/Library/Homebrew/cmd/prune.rb
@@ -7,7 +7,7 @@ module Homebrew extend self
$d = 0
dirs = []
- %w[bin sbin etc lib include share].map{ |d| HOMEBREW_PREFIX/d }.each do |path|
+ %w[bin sbin etc lib include share].map{ |d| HOMEBREW_PREFIX+d }.each do |path|
path.find do |path|
path.extend ObserverPathnameExtension
if path.symlink?
diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb
index ccbf784d4..19e52f0bb 100644
--- a/Library/Homebrew/cmd/search.rb
+++ b/Library/Homebrew/cmd/search.rb
@@ -39,7 +39,7 @@ module Homebrew extend self
# Filter out aliases when the full name was also found
results.reject do |alias_name|
if aliases.include? alias_name
- resolved_name = (HOMEBREW_REPOSITORY/"Library/Aliases"/alias_name).readlink.basename('.rb').to_s
+ resolved_name = (HOMEBREW_REPOSITORY+"Library/Aliases"+alias_name).readlink.basename('.rb').to_s
results.include? resolved_name
end
end
diff --git a/Library/Homebrew/compatibility.rb b/Library/Homebrew/compatibility.rb
index e9008045b..43180ce1e 100644
--- a/Library/Homebrew/compatibility.rb
+++ b/Library/Homebrew/compatibility.rb
@@ -54,7 +54,7 @@ class Formula
# Don't resolve paths or URLs
return name if name.include?("/")
- aka = HOMEBREW_REPOSITORY/:Library/:Aliases/name
+ aka = HOMEBREW_REPOSITORY+"Library/Aliases"+name
if aka.file?
aka.realpath.basename('.rb').to_s
else
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index 29d2c1d19..603239a34 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -18,7 +18,7 @@ module HomebrewArgvExtension
require 'keg'
require 'formula'
@kegs ||= downcased_unique_named.collect do |name|
- d = HOMEBREW_CELLAR/Formula.caniconical_name(name)
+ d = HOMEBREW_CELLAR+Formula.caniconical_name(name)
dirs = d.children.select{ |pn| pn.directory? } rescue []
raise NoSuchKegError.new(name) if not d.directory? or dirs.length == 0
raise MultipleVersionsInstalledError.new(name) if dirs.length > 1
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 48abbba40..654713e73 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -299,8 +299,8 @@ class Formula
end
def self.caniconical_name name
- formula_with_that_name = HOMEBREW_REPOSITORY/"Library/Formula/#{name}.rb"
- possible_alias = HOMEBREW_REPOSITORY/"Library/Aliases"/name
+ formula_with_that_name = HOMEBREW_REPOSITORY+"Library/Formula/#{name}.rb"
+ possible_alias = HOMEBREW_REPOSITORY+"Library/Aliases"+name
if name.include? "/"
# Don't resolve paths or URLs
name
@@ -365,7 +365,7 @@ class Formula
end
def self.path name
- HOMEBREW_REPOSITORY/"Library/Formula/#{name.downcase}.rb"
+ HOMEBREW_REPOSITORY+"Library/Formula/#{name.downcase}.rb"
end
def deps
diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb
index 0ab17cc2a..209f42e75 100644
--- a/Library/Homebrew/global.rb
+++ b/Library/Homebrew/global.rb
@@ -27,10 +27,10 @@ HOMEBREW_REPOSITORY = Pathname.new(HOMEBREW_BREW_FILE).realpath.dirname.parent #
# Where we store built products; /usr/local/Cellar if it exists,
# otherwise a Cellar relative to the Repository.
-HOMEBREW_CELLAR = if (HOMEBREW_PREFIX/"Cellar").exist?
- HOMEBREW_PREFIX/"Cellar"
+HOMEBREW_CELLAR = if (HOMEBREW_PREFIX+"Cellar").exist?
+ HOMEBREW_PREFIX+"Cellar"
else
- HOMEBREW_REPOSITORY/"Cellar"
+ HOMEBREW_REPOSITORY+"Cellar"
end
MACOS_FULL_VERSION = `/usr/bin/sw_vers -productVersion`.chomp
diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb
index 4746ac5f4..2aadaec00 100755
--- a/Library/Homebrew/install.rb
+++ b/Library/Homebrew/install.rb
@@ -167,7 +167,7 @@ def install f
end
# Check for man pages that aren't in share/man
- if (f.prefix/:man).exist?
+ if (f.prefix+'man').exist?
opoo 'A top-level "man" folder was found.'
puts "Homebrew requires that man pages live under share."
puts 'This can often be fixed by passing "--mandir=#{man}" to configure.'