[Bps-public-commit] r15290 - in Shipwright/branches/1.10: share/bin

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Wed Aug 20 09:17:39 2008
New Revision: 15290

Modified:
   Shipwright/branches/1.10/lib/Shipwright/Build.pm
   Shipwright/branches/1.10/share/bin/shipwright-builder

Log:
merged 15288:15289 to 1.1

Modified: Shipwright/branches/1.10/lib/Shipwright/Build.pm
==============================================================================
--- Shipwright/branches/1.10/lib/Shipwright/Build.pm	(original)
+++ Shipwright/branches/1.10/lib/Shipwright/Build.pm	Wed Aug 20 09:17:39 2008
@@ -318,7 +318,7 @@
                 $type = 'perl';
             }
             elsif (
-                $shebang =~ m{$base(?:/|\\)(?:s?bin|libexec)(?:/|\\)(\w+)
+                $shebang =~ m{$base(?:/|\\)(?:s?bin)(?:/|\\)(\w+)
                 |\benv\s+(\w+)}x
               )
             {
@@ -352,7 +352,7 @@
     my @dirs =
       grep { -d $_ }
       map { catfile( $self->install_base, $_ ) }
-      qw/bin sbin libexec/;
+      qw/bin sbin/;
     find( $sub, @dirs ) if @dirs;
 }
 

Modified: Shipwright/branches/1.10/share/bin/shipwright-builder
==============================================================================
--- Shipwright/branches/1.10/share/bin/shipwright-builder	(original)
+++ Shipwright/branches/1.10/share/bin/shipwright-builder	Wed Aug 20 09:17:39 2008
@@ -422,7 +422,7 @@
             my $shebang = <$fh>;
             if (
                 $shebang =~ m{
-\Q$args{'install-base'}\E(?:/|\\)(?:s?bin|libexec)(?:/|\\)(\w+)
+\Q$args{'install-base'}\E(?:/|\\)(?:s?bin)(?:/|\\)(\w+)
 |\benv\s+(\w+)
 }x
               )
@@ -458,7 +458,7 @@
     my @dirs =
       grep { -d $_ }
       map { catfile( $args{'install-base'}, $_ ) }
-      qw/bin sbin libexec/;
+      qw/bin sbin/;
     find( $sub, @dirs ) if @dirs;
 
 }