summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2017-05-02 09:57:51 +0000
committerNorbert Preining <preining@logic.at>2017-05-02 09:57:51 +0000
commit0b1b85702239b85c013c3a89218bd5cdcce06b04 (patch)
tree16ff1831bda5b540399d4fa2e933926da81d1cc8 /Master
parentb1a05f99962517802b89401bce8bb62e356a8263 (diff)
more visible warning messages, rewording
git-svn-id: svn://tug.org/texlive/trunk@44149 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/updmap.pl7
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm8
2 files changed, 11 insertions, 4 deletions
diff --git a/Master/texmf-dist/scripts/texlive/updmap.pl b/Master/texmf-dist/scripts/texlive/updmap.pl
index 289ff44f30d..fd11acefcf4 100755
--- a/Master/texmf-dist/scripts/texlive/updmap.pl
+++ b/Master/texmf-dist/scripts/texlive/updmap.pl
@@ -1323,7 +1323,12 @@ sub mkMaps {
# 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.
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 114e553fc50..4426d0dc026 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -4020,7 +4020,7 @@ sub setup_sys_user_mode {
$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 @@ sub setup_sys_user_mode {
$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);