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

Use Pathname.glob when we want pathname objects

Browse Source
This commit is contained in:
Jack Nagel 2014-05-31 23:53:46 -05:00
parent bf365fc23b
commit a023f10310
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,8 +359,7 @@ class Pathname
# Writes a wrapper env script and moves all files to the dst # Writes a wrapper env script and moves all files to the dst
def env_script_all_files dst, env def env_script_all_files dst, env
dst.mkpath dst.mkpath
Dir["#{self}/*"].each do |file| Pathname.glob("#{self}/*") do |file|
file = Pathname.new(file)
dst.install_p file dst.install_p file
new_file = dst+file.basename new_file = dst+file.basename
file.write_env_script(new_file, env) file.write_env_script(new_file, env)

3
Library/Homebrew/formula_installer.rb
View File

@ -649,8 +649,7 @@ class FormulaInstaller
downloader.stage downloader.stage
end end
Dir["#{f.bottle_prefix}/{etc,var}/**/*"].each do |file| Pathname.glob("#{f.bottle_prefix}/{etc,var}/**/*") do |path|
path = Pathname.new(file)
path.extend(InstallRenamed) path.extend(InstallRenamed)
path.cp_path_sub(f.bottle_prefix, HOMEBREW_PREFIX) path.cp_path_sub(f.bottle_prefix, HOMEBREW_PREFIX)
end end