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

use Utils.popen_read instead of ENV trick to escape path

Browse Source 
Closes Homebrew/homebrew#45021.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2015-10-16 17:19:02 +08:00
parent 646f94adfe
commit b743cadd87
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/os/mac/mach.rb
View File

@ -164,11 +164,10 @@ module MachO
end end
def parse_otool_L_output def parse_otool_L_output
ENV["HOMEBREW_MACH_O_FILE"] = path.expand_path.to_s args = ["-L", path.expand_path.to_s]
libs = `#{MacOS.otool} -L "$HOMEBREW_MACH_O_FILE"`.split("\n") libs = Utils.popen_read(OS::Mac.otool, *args).split("\n")
unless $?.success? unless $?.success?
raise ErrorDuringExecution.new(MacOS.otool, raise ErrorDuringExecution.new(OS::Mac.otool, args)
["-L", ENV["HOMEBREW_MACH_O_FILE"]])
end end
libs.shift # first line is the filename libs.shift # first line is the filename
@ -177,8 +176,6 @@ module MachO
libs.map! { |lib| lib[OTOOL_RX, 1] }.compact! libs.map! { |lib| lib[OTOOL_RX, 1] }.compact!
return id, libs return id, libs
ensure
ENV.delete "HOMEBREW_MACH_O_FILE"
end end
end end