summaryrefslogtreecommitdiff
path: root/installperl
diff options
context:
space:
mode:
authorM. J. T. Guy <mjtg@cus.cam.ac.uk>2000-07-22 15:02:11 +0100
committerJarkko Hietaniemi <jhi@iki.fi>2000-07-24 00:09:18 +0000
commita3ed4895ba809704545ce2abde01b6d31ea532a6 (patch)
treead737bb28ae85720a6001a16999e4e626e58d5e5 /installperl
parent3ba19564c18a5e98833654c556b92399f4081f2c (diff)
downloadperl-a3ed4895ba809704545ce2abde01b6d31ea532a6.tar.gz
Send all installperl messages to STDERR and be -w clean.
Subject: [PATCH] Re: [ID 20000721.003] installperl stderr/stdout problem Message-Id: <E13Fyux-0003Q2-00@libra.cus.cam.ac.uk> p4raw-id: //depot/perl@6421
Diffstat (limited to 'installperl')
-rwxr-xr-xinstallperl4
1 files changed, 2 insertions, 2 deletions
diff --git a/installperl b/installperl
index 09ffc806dd..f296712799 100755
--- a/installperl
+++ b/installperl
@@ -307,7 +307,7 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VM
my $mainperl_is_instperl = 0;
-if ($Config{installusrbinperl} eq 'define' &&
+if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' &&
!$versiononly && !$nonono && !$Is_W32 && !$Is_VMS && -t STDIN && -t STDERR
&& -w $mainperldir && ! samepath($mainperldir, $installbin)) {
my($usrbinperl) = "$mainperldir/$perl$exe_ext";
@@ -465,7 +465,7 @@ sub yn {
my($prompt) = @_;
my($answer);
my($default) = $prompt =~ m/\[([yn])\]\s*$/i;
- print $prompt;
+ print STDERR $prompt;
chop($answer = <STDIN>);
$answer = $default if $answer =~ m/^\s*$/;
($answer =~ m/^[yY]/);