aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend
diff options
context:
space:
mode:
authorilovezfs2017-06-01 04:06:40 -0700
committerGitHub2017-06-01 04:06:40 -0700
commit197392b56d38a4f5225886f1a10e2ccaa51faa98 (patch)
tree14bf38f815db5fc30c3d1e26dfb0a18d4e536540 /Library/Homebrew/extend
parent63b2eb9ffd1a0131194e99c65e3f0e1e1980ed9b (diff)
downloadbrew-197392b56d38a4f5225886f1a10e2ccaa51faa98.tar.bz2
Revert "Fix operator spacing."
Diffstat (limited to 'Library/Homebrew/extend')
-rw-r--r--Library/Homebrew/extend/ARGV.rb2
-rw-r--r--Library/Homebrew/extend/ENV/std.rb2
-rw-r--r--Library/Homebrew/extend/os/mac/extend/ENV/std.rb2
-rw-r--r--Library/Homebrew/extend/pathname.rb14
4 files changed, 10 insertions, 10 deletions
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index c6cb54f5d..8cc2ccbc0 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -138,7 +138,7 @@ module HomebrewArgvExtension
end
def next
- at(@n + 1) || raise(UsageError)
+ at(@n+1) || raise(UsageError)
end
def value(name)
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb
index 4a871f9bb..91189f53a 100644
--- a/Library/Homebrew/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/ENV/std.rb
@@ -98,7 +98,7 @@ module Stdenv
# @private
def determine_cxx
dir, base = determine_cc.split
- dir/base.to_s.sub("gcc", "g++").sub("clang", "clang++")
+ dir / base.to_s.sub("gcc", "g++").sub("clang", "clang++")
end
def gcc_4_0
diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb
index dd273cfbc..4853ecf0c 100644
--- a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb
@@ -7,7 +7,7 @@ module Stdenv
# Mountain Lion's sed is stricter, and errors out when
# it encounters files with mixed character sets
delete("LC_ALL")
- self["LC_CTYPE"] = "C"
+ self["LC_CTYPE"]="C"
end
# Add lib and include etc. from the current macosxsdk to compiler flags:
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index 767d83ff9..93b1c720b 100644
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@@ -246,7 +246,7 @@ class Pathname
rmdir
true
rescue Errno::ENOTEMPTY
- if (ds_store = join(".DS_Store")).exist? && children.length == 1
+ if (ds_store = self+".DS_Store").exist? && children.length == 1
ds_store.unlink
retry
else
@@ -343,7 +343,7 @@ class Pathname
# @private
def resolved_path
- symlink? ? dirname.join(readlink) : self
+ symlink? ? dirname+readlink : self
end
# @private
@@ -353,7 +353,7 @@ class Pathname
# The link target contains NUL bytes
false
else
- dirname.join(link).exist?
+ (dirname+link).exist?
end
# @private
@@ -367,7 +367,7 @@ class Pathname
if !other.respond_to?(:to_str) && !other.respond_to?(:to_path)
odeprecated "Pathname#/ with #{other.class}", "a String or a Pathname"
end
- join(other.to_s)
+ self + other.to_s
end
end
@@ -403,7 +403,7 @@ class Pathname
mkpath
targets.each do |target|
target = Pathname.new(target) # allow pathnames or strings
- join(target.basename).write <<-EOS.undent
+ (self+target.basename).write <<-EOS.undent
#!/bin/bash
exec "#{target}" "$@"
EOS
@@ -427,7 +427,7 @@ class Pathname
Pathname.glob("#{self}/*") do |file|
next if file.directory?
dst.install(file)
- new_file = dst.join(file.basename)
+ new_file = dst+file.basename
file.write_env_script(new_file, env)
end
end
@@ -435,7 +435,7 @@ class Pathname
# Writes an exec script that invokes a java jar
def write_jar_script(target_jar, script_name, java_opts = "")
mkpath
- join(script_name).write <<-EOS.undent
+ (self+script_name).write <<-EOS.undent
#!/bin/bash
exec java #{java_opts} -jar #{target_jar} "$@"
EOS