[Bps-public-commit] r10499 - in bpsbuilder/Shipwright/lib/Shipwright: .

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Fri Jan 25 13:00:57 2008
New Revision: 10499

Modified:
   bpsbuilder/Shipwright/lib/Shipwright/Backend.pm
   bpsbuilder/Shipwright/lib/Shipwright/Backend/SVK.pm
   bpsbuilder/Shipwright/lib/Shipwright/Backend/SVN.pm

Log:
no shipwright-utilify in installed base any more

Modified: bpsbuilder/Shipwright/lib/Shipwright/Backend.pm
==============================================================================
--- bpsbuilder/Shipwright/lib/Shipwright/Backend.pm	(original)
+++ bpsbuilder/Shipwright/lib/Shipwright/Backend.pm	Fri Jan 25 13:00:57 2008
@@ -228,13 +228,6 @@
     mkdir File::Spec->catfile( $args{'install-base'},       'bin' )
       unless -e File::Spec->catfile( $args{'install-base'}, 'bin' );
 
-    copy(
-        File::Spec->catfile( 'bin', 'shipwright-installed-utility' ),
-        File::Spec->catfile(
-            $args{'install-base'}, 'bin', 'shipwright-utility'
-        )
-    );
-
     wrap_bin();
     print "install finished, the dists are at $args{'install-base'}\n";
     print $log "install finished, the dists are at $args{'install-base'}\n";
@@ -379,43 +372,6 @@
 
 EOF
 , 
-
-'installed-utility' => <<'EOF'
-#!/usr/bin/env perl
-use strict;
-use warnings;
-
-use Getopt::Long;
-use YAML::Syck;
-use File::Find;
-
-my %args;
-GetOptions( \%args, 'fix-shebang', 'old-path=s', 'new-path=s' );
-
-if ( $args{'fix-shebang'} ) {
-
-    die 'we need old-path arg to fix the shebang' unless $args{'old-path'};
-
-    unless ( $args{'new-path'} ) {
-        require Cwd;
-        $args{'new-path'} = Cwd::getcwd();
-    }
-
-    my $fix = sub {
-        return unless -f $_;
-        local $/;
-        open my $fh, '<', $_ or die "can't read $_: $!";
-        my $text = <$fh>;
-        $text =~ s/^#!$args{'old-path'}/#!$args{'new-path'}/;
-        open $fh, '>', $_ or die "can't write $_: $!";
-        print $fh $text;
-    };
-
-    find( $fix, @ARGV );
-}
-
-EOF
-,
 null => '',    
 );
 

Modified: bpsbuilder/Shipwright/lib/Shipwright/Backend/SVK.pm
==============================================================================
--- bpsbuilder/Shipwright/lib/Shipwright/Backend/SVK.pm	(original)
+++ bpsbuilder/Shipwright/lib/Shipwright/Backend/SVK.pm	Fri Jan 25 13:00:57 2008
@@ -47,8 +47,6 @@
           'wrapper',
         File::Spec->catfile( $dir, 'bin', 'shipwright-builder' ) => 'builder',
         File::Spec->catfile( $dir, 'bin', 'shipwright-utility' ) => 'utility',
-        File::Spec->catfile( $dir, 'bin', 'shipwright-installed-utility' ) =>
-          'installed-utility',
         File::Spec->catfile( $dir, 't',          'test' )      => 'null',
         File::Spec->catfile( $dir, 'shipwright', 'order.yml' ) => 'null',
     );
@@ -67,9 +65,8 @@
         comment     => 'created project',
     );
     for (
-        'bin/shipwright-builder',           'bin/shipwright-utility',
-        'bin/shipwright-installed-utility', 'etc/shipwright-script-wrapper',
-        't/test'
+        'bin/shipwright-builder',        'bin/shipwright-utility',
+        'etc/shipwright-script-wrapper', 't/test'
       )
     {
         $self->propset(

Modified: bpsbuilder/Shipwright/lib/Shipwright/Backend/SVN.pm
==============================================================================
--- bpsbuilder/Shipwright/lib/Shipwright/Backend/SVN.pm	(original)
+++ bpsbuilder/Shipwright/lib/Shipwright/Backend/SVN.pm	Fri Jan 25 13:00:57 2008
@@ -47,8 +47,6 @@
           'wrapper',
         File::Spec->catfile( $dir, 'bin', 'shipwright-builder' ) => 'builder',
         File::Spec->catfile( $dir, 'bin', 'shipwright-utility' ) => 'utility',
-        File::Spec->catfile( $dir, 'bin', 'shipwright-installed-utility' ) =>
-          'installed-utility',
         File::Spec->catfile( $dir, 't',   'test' )               => 'null',
         File::Spec->catfile( $dir, 'shipwright', 'order.yml' ) => 'null',
     );
@@ -68,9 +66,8 @@
     );
 
     for (
-        'bin/shipwright-builder',           'bin/shipwright-utility',
-        'bin/shipwright-installed-utility', 'etc/shipwright-script-wrapper',
-        't/test'
+        'bin/shipwright-builder',        'bin/shipwright-utility',
+        'etc/shipwright-script-wrapper', 't/test'
       )
     {
         $self->propset(