From: Robin Smidsrød Date: Sun, 17 Mar 2013 13:55:15 +0000 (+0100) Subject: 'file' command now moves shebang line and prints script content X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Ffatpack-file-param-moves-shebang;p=p5sagit%2FApp-FatPacker.git 'file' command now moves shebang line and prints script content --- diff --git a/bin/fatpack b/bin/fatpack index 1ad9cb2..83c395e 100755 --- a/bin/fatpack +++ b/bin/fatpack @@ -65,10 +65,7 @@ Current basic recipe for packing: $ fatpack trace myscript.pl $ fatpack packlists-for `cat fatpacker.trace` >packlists $ fatpack tree `cat packlists` - $ (head -n1 myscript.pl |grep '^#!'; fatpack file; cat myscript.pl) >myscript.packed.pl - -The C code pulls out the Unix shebang -line, if there is one, and injects it at the start of the packed script. + $ fatpack file myscript.pl >myscript.packed.pl =head1 COPYRIGHT, LICENSE, AUTHOR diff --git a/lib/App/FatPacker.pm b/lib/App/FatPacker.pm index 75ba087..653a248 100644 --- a/lib/App/FatPacker.pm +++ b/lib/App/FatPacker.pm @@ -234,7 +234,19 @@ sub script_command_file { '$fatpacked{'.perlstring($_).qq!} = <<'${name}';\n! .qq!${data}${name}\n!; } sort keys %files; - print join "\n", $start, @segments, $end; + my $shebang = ""; + my $script = ""; + if ( defined $file and -r $file ) { + open my $fh, "<", $file or die("Can't read $file: $!"); + $shebang = <$fh>; + $script = join "", <$fh>; + close $fh; + unless ( index($shebang, '#!') == 0 ) { + $script = $shebang . $script; + $shebang = ""; + } + } + print join "\n", $shebang, $start, @segments, $end, $script; } =encoding UTF-8 @@ -248,10 +260,7 @@ App::FatPacker - pack your dependencies onto your script file $ fatpack trace myscript.pl $ fatpack packlists-for `cat fatpacker.trace` >packlists $ fatpack tree `cat packlists` - $ (head -n1 myscript.pl |grep '^#!'; fatpack file; cat myscript.pl) >myscript.packed.pl - -The C code pulls out the Unix shebang -line, if there is one, and injects it at the start of the packed script. + $ fatpack file myscript.pl >myscript.packed.pl See the documentation for the L script itself for more information.