Add silencer flags to installperl.

Subject: [PATCH] Making installperl silent.
Message-ID: <20000824090145.13141.qmail@foad.org>

p4raw-id: //depot/perl@6795

1 files changed, 46 insertions, 41 deletions

diff --git a/installperl b/installperl
index 23078d2ffb..401374036a 100755
--- a/installperl
+++ b/installperl
@@ -8,7 +8,9 @@ BEGIN {
 }
 
 use strict;
-use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $nonono $dostrip $versiononly $depth);
+my ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $nonono, $dostrip,
+    $versiononly, $silent, $otherperls);
+use vars qw /$depth/;
 
 BEGIN {
     $Is_VMS = $^O eq 'VMS';
@@ -27,7 +29,6 @@ use File::Path ();
 use ExtUtils::Packlist;
 use Config;
 use subs qw(unlink link chmod);
-use vars qw($packlist);
 
 # override the ones in the rest of the script
 sub mkpath {
@@ -48,10 +49,13 @@ my $perl_verbase = defined($ENV{PERLNAME_VERBASE})
 		    ? $ENV{PERLNAME_VERBASE}
 		    : $perl;
 
+$otherperls = 1;
 while (@ARGV) {
     $nonono = 1 if $ARGV[0] eq '-n';
     $dostrip = 1 if $ARGV[0] eq '-s';
     $versiononly = 1 if $ARGV[0] eq '-v';
+    $silent = 1 if $ARGV[0] eq '-S';
+    $otherperls = 0 if $ARGV[0] eq '-o';
     shift;
 }
 
@@ -161,29 +165,29 @@ if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
 if ($Is_W32 or $Is_Cygwin) {
   my $perldll;
 
-if ($Is_Cygwin) {
-  $perldll = $libperl;
-  $perldll =~ s/(\..*)?$/.$dlext/;
-  if ($Config{useshrplib} eq 'true') {
-    # install ld2 and perlld as well
-    foreach ('ld2', 'perlld') {
-      safe_unlink("$installbin/$_");
-      copy("$_", "$installbin/$_");
-      chmod(0755, "$installbin/$_");
+  if ($Is_Cygwin) {
+    $perldll = $libperl;
+    $perldll =~ s/(\..*)?$/.$dlext/;
+    if ($Config{useshrplib} eq 'true') {
+      # install ld2 and perlld as well
+      foreach ('ld2', 'perlld') {
+        safe_unlink("$installbin/$_");
+        copy("$_", "$installbin/$_");
+        chmod(0755, "$installbin/$_");
+      };
     };
-  };
-} else {
-  $perldll = 'perl56.' . $dlext;
-}
-
-   if ($dlsrc ne "dl_none.xs") {
-      -f $perldll || die "No perl DLL built\n";
-   }
-# Install the DLL
-
-   safe_unlink("$installbin/$perldll");
-   copy("$perldll", "$installbin/$perldll");
-   chmod(0755, "$installbin/$perldll");
+  } else {
+    $perldll = 'perl56.' . $dlext;
+  }
+
+  if ($dlsrc ne "dl_none.xs") {
+    -f $perldll || die "No perl DLL built\n";
+  }
+  # Install the DLL
+
+  safe_unlink("$installbin/$perldll");
+  copy("$perldll", "$installbin/$perldll");
+  chmod(0755, "$installbin/$perldll");
    
 } # if ($Is_W32 or $Is_Cygwin)
 
@@ -418,7 +422,7 @@ unless ( $versiononly && !($installprivlib =~ m/\Q$ver/)) {
 # Also skip $mainperl if the user opted to have it be a link to the
 # installed perl.
 
-if (!$versiononly) {
+if (!$versiononly && $otherperls) {
     my ($path, @path);
     my $dirsep = ($Is_OS2 || $Is_W32) ? ';' : ':' ;
     ($path = $ENV{"PATH"}) =~ s:\\:/:g ;
@@ -444,18 +448,18 @@ if (!$versiononly) {
 	    if (-x $otherperl && ! -d $otherperl);
     }
     if (@otherperls) {
-	print STDERR "\nWarning: $perl appears in your path in the following " .
+	warn "\nWarning: $perl appears in your path in the following " .
 	    "locations beyond where\nwe just installed it:\n";
 	for (@otherperls) {
-	    print STDERR "    ", $_, "\n";
+	    warn "    ", $_, "\n";
 	}
-	print STDERR "\n";
+	warn "\n";
     }
 
 }
 
 $packlist->write() unless $nonono;
-print "  Installation complete\n";
+print "  Installation complete\n" unless $silent;
 
 exit 0;
 
@@ -465,7 +469,7 @@ sub yn {
     my($prompt) = @_;
     my($answer);
     my($default) = $prompt =~ m/\[([yn])\]\s*$/i;
-    print STDERR $prompt;
+    warn $prompt;
     chop($answer = <STDIN>);
     $answer = $default if $answer =~ m/^\s*$/;
     ($answer =~ m/^[yY]/);
@@ -480,7 +484,7 @@ sub unlink {
     foreach my $name (@names) {
 	next unless -e $name;
 	chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_Cygwin);
-	print "  unlink $name\n";
+	print "  unlink $name\n" unless $silent;
 	( CORE::unlink($name) and ++$cnt 
 	  or warn "Couldn't unlink $name: $!\n" ) unless $nonono;
     }
@@ -493,11 +497,11 @@ sub safe_unlink {
     foreach my $name (@names) {
 	next unless -e $name;
 	chmod 0777, $name if ($Is_OS2 || $Is_W32);
-	print "  unlink $name\n";
+	print "  unlink $name\n" unless $silent;
 	next if CORE::unlink($name);
 	warn "Couldn't unlink $name: $!\n";
 	if ($! =~ /busy/i) {
-	    print "  mv $name $name.old\n";
+	    print "  mv $name $name.old\n" unless $silent;
 	    safe_rename($name, "$name.old")
 		or warn "Couldn't rename $name: $!\n";
 	}
@@ -522,7 +526,7 @@ sub link {
     my($from,$to) = @_;
     my($success) = 0;
 
-    print "  ln $from $to\n";
+    print "  ln $from $to\n" unless $silent;
     eval {
 	CORE::link($from, $to)
 	    ? $success++
@@ -534,8 +538,9 @@ sub link {
     };
     if ($@) {
 	warn $@;
-	print "  cp $from $to\n";
-	print "  creating new version of $to\n" if $Is_VMS and -e $to;
+	print "  cp $from $to\n" unless $silent;
+	print "  creating new version of $to\n"
+                 if $Is_VMS and -e $to and !$silent;
 	File::Copy::copy($from, $to)
 	    ? $success++
 	    : warn "Couldn't copy $from to $to: $!\n"
@@ -549,7 +554,7 @@ sub chmod {
     my($mode,$name) = @_;
 
     return if ($^O eq 'dos');
-    printf "  chmod %o %s\n", $mode, $name;
+    printf "  chmod %o %s\n", $mode, $name unless $silent;
     CORE::chmod($mode,$name)
 	|| warn sprintf("Couldn't chmod %o %s: $!\n", $mode, $name)
       unless $nonono;
@@ -558,8 +563,8 @@ sub chmod {
 sub copy {
     my($from,$to) = @_;
 
-    print "  cp $from $to\n";
-    print "  creating new version of $to\n" if $Is_VMS and -e $to;
+    print "  cp $from $to\n" unless $silent;
+    print "  creating new version of $to\n" if $Is_VMS and -e $to and !$silent;
     File::Copy::copy($from, $to)
 	|| warn "Couldn't copy $from to $to: $!\n"
       unless $nonono;
@@ -677,10 +682,10 @@ sub strip
 
     foreach my $file (@args) {
         if (-f $file) {
-            print "  strip $file\n";
+            print "  strip $file\n" unless $silent;
             system("strip", @opts, $file);
         } else {
-            print "# file '$file' skipped\n";
+            print "# file '$file' skipped\n" unless $silent;
         }
     }
 }