admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Always pass basename to install_symlink_p

Browse Source
This commit is contained in:
Jack Nagel 2015-03-24 21:05:34 -04:00
parent 6f0efd6f3d
commit ab3d622da2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/extend/pathname.rb
View File

@ -64,20 +64,20 @@ class Pathname
sources.each do |src|
case src
when Array
src.each {|s| install_symlink_p(s) }
src.each { |s| install_symlink_p(s, File.basename(s)) }
when Hash
src.each {|s, new_basename| install_symlink_p(s, new_basename) }
src.each { |s, new_basename| install_symlink_p(s, new_basename) }
else
install_symlink_p(src)
install_symlink_p(src, File.basename(src))
end
end
end
def install_symlink_p src, new_basename=src
def install_symlink_p(src, new_basename)
src = Pathname(src).expand_path(self)
dst = join File.basename(new_basename)
dst = join(new_basename)
mkpath
FileUtils.ln_sf src.relative_path_from(dst.parent), dst
FileUtils.ln_sf(src.relative_path_from(dst.parent), dst)
end
protected :install_symlink_p