perlclib.pod: Fix too long verbatim lines

[perl5.git] / installman

diff --git a/installman b/installman
index ced3028..cd8b094 100755 (executable)
--- a/installman
+++ b/installman
@@ -8,13 +8,13 @@ BEGIN {
 use strict;
 
 use Getopt::Long;
-use File::Path qw(mkpath);
+require File::Path;
 use ExtUtils::Packlist;
 use Pod::Man;
 use vars qw(%opts $packlist);
 
 require './Porting/pod_lib.pl';
-my $state = get_pod_metadata();
+my %man1 = (map {($_->[0], $_->[1])} @{get_pod_metadata()->{master}});
 
 $ENV{SHELL} = 'sh' if $^O eq 'os2';
 
@@ -64,11 +64,7 @@ $opts{verbose} ||= $opts{V} || $opts{notify};
 $packlist = ExtUtils::Packlist->new("$opts{destdir}$Config{installarchlib}/.packlist");
 
 # Install the main pod pages.
-pod2man({
-         map {
-             ($_->[0], $_->[1])
-         } @{$state->{master}}
-        }, $opts{man1dir}, $opts{man1ext}, 'pod');
+pod2man(\%man1, $opts{man1dir}, $opts{man1ext}, 'pod');
 
 # Install the pods for library modules.
 {
@@ -79,13 +75,13 @@ pod2man({
 
 # Install the pods embedded in the installed scripts
 my $has_man1dir = $opts{man1dir} ne '' && -d $opts{man1dir};
-open UTILS, "utils.lst" or die "Can't open 'utils.lst': $!";
-while (<UTILS>) {
+my $fh = open_or_die('utils.lst');
+while (<$fh>) {
     next if /^#/;
     chomp;
-    $_ = $1 if /#.*pod\s*=\s*(\S+)/;
     my ($path, $leaf) = m|^(\S*/(\S+))|;
-    $leaf =~ s/\.pod\z//;
+    # Have we already installed the manpage for this? (eg perldoc, a2p)
+    next if $man1{$leaf};
     pod2man({$leaf, $path}, $opts{man1dir}, $opts{man1ext});
     if ($has_man1dir) {
         if (my ($link) = m|#.*link\s*=\s*\S+/(\S+)|) {
@@ -93,14 +89,13 @@ while (<UTILS>) {
             my $new = "$opts{man1dir}/$link.$opts{man1ext}";
            unlink($new);
            link($old, $new);
-           my $xold = $old;
-           $xold =~ s/^\Q$opts{'destdir'}\E// if $opts{'destdir'};
-           my $xnew = $new;
-           $xnew =~ s/^\Q$opts{'destdir'}\E// if $opts{'destdir'};
-           $packlist->{$xnew} = { from => $xold, type => 'link' };
+            $old =~ s/^\Q$opts{destdir}\E// if $opts{destdir};
+            $new =~ s/^\Q$opts{destdir}\E// if $opts{destdir};
+            $packlist->{$new} = { from => $old, type => 'link' };
        }
     }
 }
+close $fh or my_die("close 'utils.lst': $!");
 
 sub pod2man {
     my($modpods, $mandir, $manext, $where) = @_;
@@ -123,27 +118,28 @@ sub pod2man {
         }
     }
 
-    mkpath($mandir, $opts{verbose}, 0777) unless $opts{notify};  # In File::Path
+    File::Path::mkpath($mandir, $opts{verbose}, 0777) unless $opts{notify};
 
     foreach my $manpage (sort keys %$modpods) {
         my $mod = $modpods->{$manpage};
 
        # Skip files without pod docs
        my $has_pod;
-       if (open T, $mod)
-       {
-           local $_;
-           while (<T>)
-           {
-                ++$has_pod and last if /^=head1\b/;
-           }
-
-           close T;
-       }
+        my $fh = open_or_die($mod);
+        while (my $line = <$fh>) {
+            if ($line =~ /^=head1\b/) {
+                ++$has_pod;
+                last;
+            }
+        }
+       close $fh or my_die("close '$mod': $!");
+        # Sadly it doesn't seem possible to re-use this handle for the call
+        # to parse_from_file() below, as Pod::Man relies on source_filename(),
+        # which Pod::Simple only sets accurately if it opens the file itself.
 
        unless ($has_pod)
        {
-           warn "no documentation in $mod\n";
+           warn "no documentation in $mod\n" unless $opts{silent};
            next;
        }
 
@@ -159,7 +155,7 @@ sub pod2man {
                                   );
        my $xmanpage = $manpage;
        $xmanpage =~ s/^\Q$opts{'destdir'}\E// if $opts{'destdir'};
-        print "  $xmanpage\n";
+        print "  $xmanpage\n" unless $opts{silent};
         if (!$opts{notify} && $parser->parse_from_file($mod, $tmp)) {
             if (-s $tmp) {
                 if (rename($tmp, $manpage)) {
@@ -175,8 +171,6 @@ sub pod2man {
 $packlist->write() unless $opts{notify};
 print "  Installation complete\n" if $opts{verbose};
 
-exit 0;
-
 sub rename {
     my($from,$to) = @_;
     if (-f $to and not unlink($to)) {