1 files changed, 36 insertions, 13 deletions

diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 7a090fd85f5..d91904b432b 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -3000,14 +3000,13 @@ sub welcome {
  See
    $::vars{'TEXDIR'}/index.html
  for links to documentation.  The TeX Live web site (http://tug.org/texlive/)
- contains any updates and corrections.
+ contains updates and corrections.
 
  TeX Live is a joint project of the TeX user groups around the world;
  please consider supporting it by joining the group best for you. The
  list of groups is available on the web at http://tug.org/usergroups.html.
 
  Welcome to TeX Live!
-
 EOF
   return $welcome;
 }
@@ -3020,33 +3019,57 @@ and C<INFOPATH>.
 
 =cut
 
-sub welcome_paths {
-  my $welcome=<<"EOF";
+sub welcome_paths
+{
+  my $welcome = welcome ();
 
- See
-   $::vars{'TEXDIR'}/index.html
- for links to documentation.  The TeX Live web site (http://tug.org/texlive/)
- contains any updates and corrections.
+  # ugly, remove welcome msg; better than repeating the whole text, though.
+  $welcome =~ s/\n Welcome to TeX Live!\n//;
 
- TeX Live is a joint project of the TeX user groups around the world;
- please consider supporting it by joining the group best for you. The
- list of groups is available on the web at http://tug.org/usergroups.html.
+  $welcome .= <<"EOF";
 
  Add $::vars{'TEXDIR'}/texmf/doc/man to MANPATH.
  Add $::vars{'TEXDIR'}/texmf/doc/info to INFOPATH.
 EOF
+
   if ($::vars{'from_dvd'} and !win32()) {
     $welcome .= <<"EOF";
  Set TEXMFCNF to $::vars{'TEXMFSYSVAR'}/web2c.
 EOF
-}
+  }
+
   $welcome .= <<"EOF";
+
  Most importantly, add $::vars{'TEXDIR'}/bin/$::vars{'this_platform'}
  to your PATH for current and future sessions.
+EOF
 
- Welcome to TeX Live!
+  # check for tex-related envvars.
+  my $texenvs = "";
+  for my $evar (sort keys %ENV) {
+    next if $evar =~ /^(SHELLOPTS|PATH|.*PWD|_)$/; # don't worry about these
+    if ("$evar $ENV{$evar}" =~ /tex/i) { # check both key and value
+      $texenvs .= "    $evar=$ENV{$evar}\n";
+    }
+  }
+  if ($texenvs) {
+    $welcome .= <<"EOF";
 
+ ----------------------------------------------------------------------
+ The following environment variables contain the string "tex"
+ (case-independent).  If you're doing anything but adding personal
+ directories to the system paths, they may well cause trouble with
+ some parts of running TeX.  If you encounter problems, try unsetting
+ them.  (And please ignore any spurious matches that are unrelated to TeX.)
+$texenvs ----------------------------------------------------------------------
 EOF
+  }
+  
+  $welcome .= <<"EOF";
+
+ Welcome to TeX Live!
+EOF
+
   return $welcome;
 }