texlive[45019] Master/texmf-dist/scripts/texlive/tlmgr.pl: more

[commits+preining at tug.org]

Revision: 45019
          http://tug.org/svn/texlive?view=revision&revision=45019
Author:   preining
Date:     2017-08-11 15:17:30 +0200 (Fri, 11 Aug 2017)
Log Message:
-----------
more autoflush/machinereadable stuff for tlshell

Modified Paths:
--------------
    trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl

Modified: trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2017-08-11 13:06:29 UTC (rev 45018)
+++ trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl	2017-08-11 13:17:30 UTC (rev 45019)
@@ -5890,8 +5890,11 @@
     my $did_prompt = 0;
     while (defined(my $arg = shift @_)) {
       if ($arg =~ m/^-prompt$/) {
-        print shift @_, " ";
-        $did_prompt = 1;
+        # only do allow for prompt rewriting in case of ! machine readable!
+        if (!$::machinereadable) {
+          print shift @_, " ";
+          $did_prompt = 1;
+        }
       } elsif ($arg =~ m/^-menu$/) {
         my $options = shift @_;
         @options = @$options;
@@ -5907,8 +5910,11 @@
       } elsif ($arg =~ m/^-/) {
         print "ERROR unsupported prompt command, please report: $arg!\n";
       } else {
-        print $arg, " ";
-        $did_prompt = 1;
+        # only do allow for prompt rewriting in case of ! machine readable!
+        if (!$::machinereadable) {
+          print $arg, " ";
+          $did_prompt = 1;
+        }
       }
     }
     print "$default_prompt " if (!$did_prompt);
@@ -5940,6 +5946,7 @@
       }
       if (!$isok) {
         print("Please answer one of: @guarantee\n");
+        print "\n" if $opts{'autoflush'};
         return(&$do_prompt(@savedargs));
       }
     }