X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/0f8767845c2e9b6c1a4363147835e5b95b61151d..dc529e655355bff17b35ddec08d5bc5cbbdd206a:/installman

diff --git a/installman b/installman
index cd8b094..60fbce3 100755
--- a/installman
+++ b/installman
@@ -1,14 +1,16 @@
 #!./perl -w
+
 BEGIN {
     @INC = qw(lib);
 
     # This needs to be at BEGIN time, before any use of Config
+    # install_lib itself loads and imports Config into main::
     require './install_lib.pl';
 }
+
 use strict;
 
 use Getopt::Long;
-require File::Path;
 use ExtUtils::Packlist;
 use Pod::Man;
 use vars qw(%opts $packlist);
@@ -36,9 +38,12 @@ my $usage =
         --verbose (or -V) report all progress.
         --silent  (or -S) be silent. Only report errors.\n";
 
+# --strip intentionally does nothing. By permitting installman to accept it
+# without error, the Makefile can pass the same options to installperl and
+# installman, which permits more simplification there than this comment costs.
 GetOptions( \%opts,
             qw( man1dir=s man1ext=s man3dir=s man3ext=s
-                destdir:s notify n help silent S verbose V))
+                destdir:s notify|n help|h|? silent|S verbose|V strip))
 	|| die $usage;
 die $usage if $opts{help};
 $opts{destdir} //= '';
@@ -47,9 +52,7 @@ foreach my $pre (qw(man1 man3)) {
     $opts{"${pre}dir"} //= $opts{destdir} . $Config{"install${pre}dir"};
     $opts{"${pre}ext"} //= $Config{"${pre}ext"};
 }
-$opts{silent} ||= $opts{S};
-$opts{notify} ||= $opts{n};
-$opts{verbose} ||= $opts{V} || $opts{notify};
+$opts{verbose} ||= $opts{notify};
 
 #Sanity checks
 
@@ -80,7 +83,7 @@ while (<$fh>) {
     next if /^#/;
     chomp;
     my ($path, $leaf) = m|^(\S*/(\S+))|;
-    # Have we already installed the manpage for this? (eg perldoc, a2p)
+    # Have we already installed the manpage for this? (eg perldoc)
     next if $man1{$leaf};
     pod2man({$leaf, $path}, $opts{man1dir}, $opts{man1ext});
     if ($has_man1dir) {
@@ -118,7 +121,7 @@ sub pod2man {
         }
     }
 
-    File::Path::mkpath($mandir, $opts{verbose}, 0777) unless $opts{notify};
+    mkpath($mandir);
 
     foreach my $manpage (sort keys %$modpods) {
         my $mod = $modpods->{$manpage};
@@ -139,7 +142,7 @@ sub pod2man {
 
 	unless ($has_pod)
 	{
-	    warn "no documentation in $mod\n" unless $opts{silent};
+	    print "no documentation in $mod\n" if $opts{verbose};
 	    next;
 	}
 
@@ -158,7 +161,7 @@ sub pod2man {
         print "  $xmanpage\n" unless $opts{silent};
         if (!$opts{notify} && $parser->parse_from_file($mod, $tmp)) {
             if (-s $tmp) {
-                if (rename($tmp, $manpage)) {
+                if (safe_rename($tmp, $manpage)) {
                     $packlist->{$xmanpage} = { type => 'file' };
                     next;
                 }
@@ -171,23 +174,4 @@ sub pod2man {
 $packlist->write() unless $opts{notify};
 print "  Installation complete\n" if $opts{verbose};
 
-sub rename {
-    my($from,$to) = @_;
-    if (-f $to and not unlink($to)) {
-	my($i);
-	for ($i = 1; $i < 50; $i++) {
-	    last if CORE::rename($to, "$to.$i");
-	}
-	warn("Cannot rename to '$to.$i': $!"), return 0
-	    if $i >= 50;	# Give up!
-    }
-    link($from,$to) || return 0;
-    unlink($from);
-}
-
-# Local variables:
-# cperl-indent-level: 4
-# indent-tabs-mode: nil
-# End:
-#
 # ex: set ts=8 sts=4 sw=4 et: