From 399ab9a6bf006451d8f9930576923dfbe4d091b4 Mon Sep 17 00:00:00 2001 From: Andy Lester Date: Sun, 18 Sep 2011 13:29:13 -0500 Subject: [PATCH] Added version numbers ot the shebang detection --- Ack.pm | 2 +- Changes | 6 ++++++ ack | 3 ++- ack-base | 1 + t/swamp/perl-without-extension | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Ack.pm b/Ack.pm index 70e35b5..4631ffd 100644 --- a/Ack.pm +++ b/Ack.pm @@ -539,7 +539,7 @@ sub filetypes { close $fh; if ( $header =~ /^#!/ ) { - return ($1,TEXT) if $header =~ /\b(ruby|lua|p(?:erl|hp|ython))\d*\b/; + return ($1,TEXT) if $header =~ /\b(ruby|lua|p(?:erl|hp|ython))-?(\d[\d.]*)?\b/; return ('shell',TEXT) if $header =~ /\b(?:ba|t?c|k|z)?sh\b/; } else { diff --git a/Changes b/Changes index 9bf7069..5b25bad 100644 --- a/Changes +++ b/Changes @@ -9,6 +9,12 @@ NEXT Added .pm6 as a --perl extension. + Lua can now get detected from the shebang line. Thanks, Matthew Wild. + + Added support for version numbers in executables in shebang + detection. Now if your Perl program's shebang refers to + /usr/local/bin/perl-5.14.1, ack will find it. + 1.94 Mon Nov 15 22:38:48 CST 2010 diff --git a/ack b/ack index a030864..2dfd63b 100755 --- a/ack +++ b/ack @@ -908,6 +908,7 @@ L How appropriate to have Inowledgements! Thanks to everyone who has contributed to ack in any way, including +Matthew Wild, Scott Kyle, Nick Hooey, Bo Borgerson, @@ -1623,7 +1624,7 @@ sub filetypes { close $fh; if ( $header =~ /^#!/ ) { - return ($1,TEXT) if $header =~ /\b(ruby|p(?:erl|hp|ython))\b/; + return ($1,TEXT) if $header =~ /\b(ruby|lua|p(?:erl|hp|ython))-?(\d[\d.]*)?\b/; return ('shell',TEXT) if $header =~ /\b(?:ba|t?c|k|z)?sh\b/; } else { diff --git a/ack-base b/ack-base index 369dd45..88f1ef5 100755 --- a/ack-base +++ b/ack-base @@ -900,6 +900,7 @@ L How appropriate to have Inowledgements! Thanks to everyone who has contributed to ack in any way, including +Matthew Wild, Scott Kyle, Nick Hooey, Bo Borgerson, diff --git a/t/swamp/perl-without-extension b/t/swamp/perl-without-extension index 2bef777..49ac025 100644 --- a/t/swamp/perl-without-extension +++ b/t/swamp/perl-without-extension @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl-5.14.1 -w use strict; use warnings;