install-tl: welcome message for tl-portable

git-svn-id: svn://tug.org/texlive/trunk@9473 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 13 insertions, 11 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 28ceeaabf34..239ab91c2fd 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -30,15 +30,16 @@ BEGIN {
     $localpath = '.';
   }
   $::installerdir='.';
-# The installer uses a minimal subset of Perl for Windows.  In order
-# to avoid conflicts with other versions of Perl already installed on
-# the system, we simply ignore them.  The installer has to execute
-# $::installerdir/tlpkg/bin/perl.exe and should not rely on any other
-# Perl executable.
-
+  # Windows: The installer uses a minimal subset of Perl.  In order
+  # to avoid conflicts with other versions of Perl already installed on
+  # the system, we simply ignore them.  The installer has to execute
+  # $::installerdir/tlpkg/bin/perl.exe and should not rely on any other
+  # Perl executable. The batchfile wrapper takes care of this.
   #if ($^O=~/^MSWin(32|64)$/i) {
   #  @INC="$::installerdir/tlpkg/installer/perllib";
   #}
+
+  # All platforms: add the installer modules
   unshift (@INC, "$::installerdir/tlpkg");
 }
 
@@ -294,6 +295,7 @@ if ($opt_arch) {
     do_postinst_stuff();
   }
   close($::LOGFILE) if defined($::LOGFILE);
+  print TeXLive::TLUtils::welcome;
   exit 0;
 }
 
@@ -1211,7 +1213,7 @@ sub do_cleanup
 {
   # now open the log file and write out the log lines
   # try to open a log file
-  # the user could have given the -logfile option in which case all the 
+  # the user could have given the -logfile option in which case all the
   # stuff is already dumped to it and $::LOGFILE defined. So do not
   # redefine it
   if (!defined($::LOGFILE)) {
@@ -1255,8 +1257,8 @@ sub do_cleanup
   close($::LOGFILE) if defined($::LOGFILE);
 
   #print "Don't forget to set TEXMFSYSVAR to ".$vars{'TEXMFSYSVAR'}."!!!\n"
-  print "Don't forget to set TEXMFCNF to\n  ". $vars{'TEXMFSYSVAR'}."/web2c !!!\n"
-    if ($vars{'from_dvd'} and !win32());
+  #print "Don't forget to set TEXMFCNF to\n  ". $vars{'TEXMFSYSVAR'}."/web2c !!!\n"
+  #  if ($vars{'from_dvd'} and !win32());
 }
 
 __END__
@@ -1294,8 +1296,8 @@ Polish (pl) and Slovenian (sl).
 
 =item B<-location> I<url|path>
 
-Provide an installation source, either a local directory via 
-C</path/to/directory> or a C<file:/> url, or a network location via 
+Provide an installation source, either a local directory via
+C</path/to/directory> or a C<file:/> url, or a network location via
 a C<http://> or C<ftp://> url.
 
 If the location is local, the installation type (compressed or live) is