texlive[44149] Master: more visible warning messages, rewording

[commits+preining at tug.org]

Revision: 44149
          http://tug.org/svn/texlive?view=revision&revision=44149
Author:   preining
Date:     2017-05-02 11:57:51 +0200 (Tue, 02 May 2017)
Log Message:
-----------
more visible warning messages, rewording

Modified Paths:
--------------
    trunk/Master/texmf-dist/scripts/texlive/updmap.pl
    trunk/Master/tlpkg/TeXLive/TLUtils.pm

Modified: trunk/Master/texmf-dist/scripts/texlive/updmap.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/updmap.pl	2017-05-02 00:06:44 UTC (rev 44148)
+++ trunk/Master/texmf-dist/scripts/texlive/updmap.pl	2017-05-02 09:57:51 UTC (rev 44149)
@@ -1323,7 +1323,12 @@
   # all kind of warning messages
   if ($first_time_creation_in_usermode) {
     print_and_log("
-WARNING: you are switching to updmap's per-user mappings.
+*************************************************************
+*                                                           *
+* WARNING: you are switching to updmap's per-user mappings. *
+*            Please read the following explanations.        *
+*                                                           *
+*************************************************************
 
 You have run updmap-user (as opposed to updmap-sys) for the first time; this
 has created configuration files which are local to your personal account.

Modified: trunk/Master/tlpkg/TeXLive/TLUtils.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLUtils.pm	2017-05-02 00:06:44 UTC (rev 44148)
+++ trunk/Master/tlpkg/TeXLive/TLUtils.pm	2017-05-02 09:57:51 UTC (rev 44149)
@@ -4020,7 +4020,7 @@
       $TEXMFVAR, $TEXMFSYSVAR) = @_;
   
   if ($optsref->{'user'} && $optsref->{'sys'}) {
-    print STDERR "$prg [ERROR]: only one of -user and -sys can be used.\n";
+    print STDERR "$prg [ERROR]: only one of -sys or -user can be used.\n";
     exit(1);
   }
 
@@ -4053,8 +4053,10 @@
     $texmfconfig = $TEXMFCONFIG;
     $texmfvar    = $TEXMFVAR;
   } else {
-    print STDERR "$prg [ERROR]: Either -user or -sys mode is required.\n" .
-      "See http://tug.org/texlive/scripts-sys-user.html for details.\n";
+    print STDERR "" .
+      "$prg [ERROR]: Either -sys or -user mode is required.\n" .
+      "$prg [ERROR]: In nearly all cases you should use $prg -sys.\n" .
+      "$prg [ERROR]: For special cases see http://tug.org/texlive/scripts-sys-user.html\n" ;
     exit(1);
   }
   return ($texmfconfig, $texmfvar);