aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend/pathname.rb
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Homebrew/extend/pathname.rb')
-rw-r--r--Library/Homebrew/extend/pathname.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index c413e9e94..767d83ff9 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 = self+".DS_Store").exist? && children.length == 1
+ if (ds_store = join(".DS_Store")).exist? && children.length == 1
ds_store.unlink
retry
else
@@ -322,7 +322,7 @@ class Pathname
def sha256
require "digest/sha2"
- incremental_hash(Digest::SHA2)
+ incremental_hash(Digest::SHA256)
end
def verify_checksum(expected)
@@ -343,7 +343,7 @@ class Pathname
# @private
def resolved_path
- symlink? ? dirname+readlink : self
+ symlink? ? dirname.join(readlink) : self
end
# @private
@@ -353,7 +353,7 @@ class Pathname
# The link target contains NUL bytes
false
else
- (dirname+link).exist?
+ dirname.join(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
- self + other.to_s
+ join(other.to_s)
end
end
@@ -403,7 +403,7 @@ class Pathname
mkpath
targets.each do |target|
target = Pathname.new(target) # allow pathnames or strings
- (self+target.basename).write <<-EOS.undent
+ join(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+file.basename
+ new_file = dst.join(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
- (self+script_name).write <<-EOS.undent
+ join(script_name).write <<-EOS.undent
#!/bin/bash
exec java #{java_opts} -jar #{target_jar} "$@"
EOS