sub paraprint;
-my($Version) = "1.13";
+my($Version) = "1.14";
# Changed in 1.06 to skip Mail::Send and Mail::Util if not available.
# Changed in 1.07 to see more sendmail execs, and added pipe output.
# clearer and add $ENV{REPLYTO}.
# Changed in 1.13 to hopefully make it more difficult to accidentally
# send mail
+# Changed in 1.14 to make the prompts a little more clear on providing
+# helpful information. Also let file read fail gracefully.
# TODO: Allow the user to re-name the file on mail failure, and
# make sure failure (transmission-wise) of Mail::Send is
# accounted for.
-my( $file, $cc, $address, $perlbug, $testaddress, $filename,
+my( $file, $usefile, $cc, $address, $perlbug, $testaddress, $filename,
$subject, $from, $verbose, $ed,
$fh, $me, $Is_VMS, $msg, $body, $andcc );
if($::opt_d or !-t STDOUT) { Dump(*STDOUT); exit; }
Query();
-Edit();
+Edit() unless $usefile;
NowWhat();
Send();
# Subject of bug-report message
$subject = $::opt_s || "";
+ # Send a file
+ $usefile = ($::opt_f || 0);
+
# File to send as report
$file = $::opt_f || "";
$body = $::opt_b || "";
# Editor
- $ed = ($::opt_f ? "file" : (
- $::opt_e || $ENV{VISUAL} || $ENV{EDITOR} || $ENV{EDIT} ||
+ $ed = ( $::opt_e || $ENV{VISUAL} || $ENV{EDITOR} || $ENV{EDIT} ||
($Is_VMS ? "edit/tpu" : "vi")
- ));
+ );
+
# My username
$me = getpwuid($<);
# Explain what perlbug is
paraprint <<EOF;
-This program allows you to create a bug report,
-which will be sent as an e-mail message to $address
-once you have filled in the report.
+This program provides an easy way to create a message reporting a bug in
+perl, and e-mail it to $address.
EOF
if(! $subject) {
paraprint <<EOF;
First of all, please provide a subject for the
-message. It should be as a concise description of
-the bug as is possible.
+message. It should be a concise description of
+the bug or problem.
EOF
print "Subject: ";
if( !$domain) {
$guess = "";
- } elsif ($Is_VMS && !$::Config{'d_has_sockets'}) {
+ } elsif ($Is_VMS && !$::Config{'d_socket'}) {
$guess = "$domain\:\:$me";
} else {
$guess = "$me\@$domain" if $domain;
$andcc = " and $cc" if $cc;
-
+editor:
+
# Prompt for editor, if no override is given
if(! $::opt_e and ! $::opt_f and ! $::opt_b) {
paraprint <<EOF;
Now you need to supply the bug report. Try to make
the report concise but descriptive. Include any
-relevant detail. Some information about your local
+relevant detail. If you are reporting something
+that does not work as you think it should, please
+try to include example of both the actual
+result, and what you expected.
+
+Some information about your local
perl configuration will automatically be included
-at the end of the report.
+at the end of the report. If you are using any
+unusual version of perl, please try and confirm
+exactly which versions are relevant.
You will probably want to use an editor to enter
the report. If "$ed" is the editor you want
my($entry) =scalar(<>);
chop $entry;
-
- if($entry ne "") {
+
+ $usefile = 0;
+ if($entry eq "file") {
+ $usefile = 1;
+ } elsif($entry ne "") {
$ed = $entry;
}
}
# Prompt for file to read report from, if needed
- if( $ed eq "file" and ! $file) {
+ if( $usefile and ! $file) {
+filename:
paraprint <<EOF;
-
What is the name of the file that contains your report?
EOF
my($entry) = scalar(<>);
chop($entry);
+ if($entry eq "") {
+ paraprint <<EOF;
+
+No filename? I'll let you go back and choose an editor again.
+
+EOF
+ goto editor;
+ }
+
if(!-f $entry or !-r $entry) {
- print "\n\nUnable to read from `$entry'.\nExiting.\n";
- exit;
+ paraprint <<EOF;
+
+I'm sorry, but I can't read from `$entry'. Maybe you mistyped the name of
+the file? If you don't want to send a file, just enter a blank line and you
+can get back to the editor selection.
+
+EOF
+ goto filename;
}
$file = $entry;
if($body) {
print REP $body;
- } elsif($file) {
- open(F,"<$file") or die "Unable to read report file: $!\n";
+ } elsif($usefile) {
+ open(F,"<$file") or die "Unable to read report file from `$file': $!\n";
while(<F>) {
print REP $_
}
sub Edit {
# Edit the report
+
+ if($usefile) {
+ $usefile = 0;
+ paraprint <<EOF;
+
+Please make sure that the name of the editor you want to use is correct.
+
+EOF
+ print "Editor [$ed]: ";
+
+ my($entry) =scalar(<>);
+ chop $entry;
-tryagain:
- if(!$file and !$body) {
+ if($entry ne "") {
+ $ed = $entry;
+ }
+ }
+
+tryagain:
+ if(!$usefile and !$body) {
my($sts) = system("$ed $filename");
if( $Is_VMS ? !($sts & 1) : $sts ) {
#print "\nUnable to run editor!\n";
chop($reply);
if( $reply eq "yes" ) {
last;
+ } else {
+ paraprint <<EOF;
+
+That wasn't a clear "yes", so I won't send your message. If you are sure
+your message should be sent, type in "yes" (without the quotes) at the
+confirmation prompt.
+
+EOF
+
}
} elsif( $action =~ /^[er]/i ) { # <E>dit, <R>e-edit
# edit the message
projects / p5sagit/p5-mst-13.2.git / blobdiff