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

Improve Pathname#text_executable? regexp

Browse Source 
file(1) does not allow leading whitespace on shebang lines, and there
appears to be no restrictions on what characters follow '#!', either.

While at it, fix an erroneous shebang test.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-06-15 20:02:49 -05:00
parent 1b6f23c8a9
commit 7002359f7a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,7 +272,7 @@ class Pathname
end end
def text_executable? def text_executable?
%r[#!\s*(/.+)+] === open('r') { |f| f.readline } %r[^#!\s*.+] === open('r') { |f| f.readline }
rescue EOFError rescue EOFError
false false
end end

4
Library/Homebrew/test/test_mach.rb
View File

@ -135,7 +135,7 @@ class TextExecutableTests < Test::Unit::TestCase
def test_malformed_shebang def test_malformed_shebang
pn = Pathname.new('baz') pn = Pathname.new('baz')
pn.write '#! ' pn.write ' #!'
assert !pn.universal? assert !pn.universal?
assert !pn.i386? assert !pn.i386?
assert !pn.x86_64? assert !pn.x86_64?
@ -146,7 +146,7 @@ class TextExecutableTests < Test::Unit::TestCase
assert !pn.text_executable? assert !pn.text_executable?
assert_equal [], pn.archs assert_equal [], pn.archs
assert pn.arch == :dunno assert pn.arch == :dunno
assert_match /text executable/, `/usr/bin/file -h '#{pn}'`.chomp assert_no_match /text executable/, `/usr/bin/file -h '#{pn}'`.chomp
end end
def teardown def teardown