install-tl (TEXLIVE_INSTALL_ENV_NOCHECK): respect this in all cases.

(TEXLIVE_INSTALL_NO_WELCOME): new envvar control for quiet.
<keyrename>: option_symlinks -> instopt_adjustpath, I guess.
(create_welcome): use here-documents for better readability.

tl-update-tlnet: use (TEXLIVE_INSTALL_NO_WELCOME, some (not all)
resulting simplifications of regexp filtering.

texconfig.sh, source/README: doc, sync.


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

3 files changed, 40 insertions, 60 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 977a7519600..be8433e4826 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -593,9 +593,11 @@ if ($opt_gui eq 'text' or
     foreach my $t (@::WARNLINES) { print STDERR $t; }
   }
   if ($::env_warns) { print STDERR $::env_warns; }
-  foreach my $t (@::welcome_arr) {
-    printf STDERR sprintf (shift @$t, @$t);
-    print STDERR "\n";
+  unless ($ENV{"TEXLIVE_INSTALL_NO_WELCOME"}) {
+    foreach my $t (@::welcome_arr) {
+      printf STDERR sprintf (shift @$t, @$t);
+      print STDERR "\n";
+    }
   }
   do_cleanup(); # sets $::LOGFILENAME if not already defined
   if ($LOGFILENAME) {
@@ -881,7 +883,7 @@ sub do_installation {
   #$errcount += 2;
 
   # check environment for possibly tex-related strings:
-  check_env();
+  check_env() unless $ENV{"TEXLIVE_INSTALL_ENV_NOCHECK"};
   # log, profile, temp files:
   do_cleanup();
 
@@ -1797,15 +1799,16 @@ sub read_profile {
   my $profilepath = shift;
   my %opts = @_;
   my %keyrename = (
-    'option_sys_bin'    => 'tlpdbopt_sys_bin',
-    'option_sys_man'    => 'tlpdbopt_sys_man',
-    'option_sys_info'   => 'tlpdbopt_sys_info',
     'option_doc'        => 'tlpdbopt_install_docfiles',
-    'option_src'        => 'tlpdbopt_install_srcfiles',
     'option_fmt'        => 'tlpdbopt_create_formats',
-    'option_path'       => 'instopt_adjustpath',
-    'option_letter'     => 'instopt_letter',
+    'option_src'        => 'tlpdbopt_install_srcfiles',
+    'option_sys_bin'    => 'tlpdbopt_sys_bin',
+    'option_sys_info'   => 'tlpdbopt_sys_info',
+    'option_sys_man'    => 'tlpdbopt_sys_man',
     'option_adjustrepo' => 'instopt_adjustrepo',
+    'option_letter'     => 'instopt_letter',
+    'option_path'       => 'instopt_adjustpath',
+    'option_symlinks'   => 'instopt_adjustpath',
     'portable'          => 'instopt_portable',
   );
 
@@ -2336,15 +2339,27 @@ EOF
 # This is an array of references to anonymous arrays of parameters for
 # either __ or sprintf: a localizable string, possibly with placeholders,
 # followed by parameters for those placeholders, if any.
-
+#
 sub create_welcome {
   @::welcome_arr = ();
   push @::welcome_arr, (["\nWelcome to TeX Live!\n"]);
-  push @::welcome_arr, [
-    "See\n %s/index.html\nfor links to documentation.\nThe TeX Live web site (https://tug.org/texlive/)\ncontains updates and corrections.\n\nTeX Live is a joint project of the TeX user groups around the world;\nplease consider supporting it by joining the group best for you.\nThe list of groups is available on the web at http://tug.org/usergroups.html.\n",
+  push @::welcome_arr, [ <<END_WELCOME_GENERIC,
+Documentation links: %s/index.html
+The TeX Live web site (https://tug.org/texlive/)
+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 on the web at https://tug.org/usergroups.html.
+END_WELCOME_GENERIC
     $::vars{'TEXDIR'}];
   if (!win32()) {
-    push @::welcome_arr, ["Add %s/texmf-dist/doc/man to MANPATH.\nAdd %s/texmf-dist/doc/info to INFOPATH.\nMost importantly, add %s/bin/%s\nto your PATH for current and future sessions.",
+    push @::welcome_arr, [ <<END_WELCOME_W32,
+Add %s/texmf-dist/doc/man to MANPATH.
+Add %s/texmf-dist/doc/info to INFOPATH.
+Most importantly, add %s/bin/%s
+to your PATH for current and future sessions.
+END_WELCOME_W32
     $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'TEXDIR'},
     $::vars{'this_platform'}];
   }
@@ -2763,6 +2778,11 @@ variables.
 
 Omit creating the ConTeXt cache.  This is useful for redistributors.
 
+=item C<TEXLIVE_INSTALL_NO_WELCOME>
+
+Omit printing the welcome message after successful installation, e.g.,
+for testing.
+
 =item C<TEXLIVE_INSTALL_PREFIX>
 
 =item C<TEXLIVE_INSTALL_TEXDIR>
diff --git a/Master/texmf-dist/scripts/texlive/texconfig.sh b/Master/texmf-dist/scripts/texlive/texconfig.sh
index b4e6da28c2a..38b2d932754 100755
--- a/Master/texmf-dist/scripts/texlive/texconfig.sh
+++ b/Master/texmf-dist/scripts/texlive/texconfig.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: texconfig.sh 34586 2014-07-13 00:06:11Z karl $
+# $Id: texconfig.sh 43845 2017-04-16 17:39:12Z karl $
 # texconfig version 3.0
 # Originally written by Thomas Esser. Public domain.
 # Now maintained as part of TeX Live; correspondence to tex-live@tug.org.
@@ -28,7 +28,7 @@ PATH="$mydir:$PATH"; export PATH
 progname=texconfig
 
 # the version string
-version='$Id: texconfig.sh 34586 2014-07-13 00:06:11Z karl $'
+version='$Id: texconfig.sh 43845 2017-04-16 17:39:12Z karl $'
 
 envVars="
   AFMFONTS BIBINPUTS BSTINPUTS CMAPFONTS CWEBINPUTS ENCFONTS GFFONTS
@@ -559,7 +559,6 @@ the TeX installation.
 
 Usage: $progname conf                  (show configuration information)
        $progname dvipdfmx paper PAPER  (dvipdfmx paper size)
-       $progname dvipdfm paper PAPER   (dvipdfm paper size)
        $progname dvips [OPTION...]     (dvips options)
        $progname faq                   (show teTeX faq)
        $progname findprog PROG...      (show locations of PROGs, a la which)
@@ -580,7 +579,6 @@ Usage: $progname conf                  (show configuration information)
 
 Get more help with:
        $progname dvipdfmx
-       $progname dvipdfm
        $progname dvips
        $progname font
        $progname hyphen
@@ -603,13 +601,13 @@ TeX Live home page: <http://tug.org/texlive/>
       echo
       echo '==================== binaries found by searching $PATH ==================='
       echo "PATH=$PATH"
-      echoLocateBinary kpsewhich updmap fmtutil texconfig tex pdftex mktexpk dvips dvipdfm
+      echoLocateBinary kpsewhich updmap fmtutil texconfig tex pdftex mktexpk dvips dvipdfmx
       echo
       echo '=========================== active config files =========================='
       echoLocateCfgfile texmf.cnf updmap.cfg fmtutil.cnf config.ps mktex.cnf XDvi pdftexconfig.tex config | sort -k 2
       echo
       echo '============================= font map files ============================='
-      for m in psfonts.map pdftex.map ps2pk.map dvipdfm.map; do
+      for m in psfonts.map pdftex.map ps2pk.map; do
         echo "$m: `kpsewhich $m`"
       done
       echo
@@ -621,39 +619,6 @@ TeX Live home page: <http://tug.org/texlive/>
       echoShowVariable $envVars
       ;;
 
-    # texconfig dvipdfm
-    dvipdfm)
-      help="Usage: $progname dvipdfm paper PAPER
-
-Valid PAPER settings:
-  letter legal ledger tabloid a4 a3"
-      case $2 in
-        # texconfig dvipdfm paper
-        paper-list)
-          for p in letter legal ledger tabloid a4 a3; do echo $p; done
-          ;;
-        paper)
-          case $3 in
-            letter|legal|ledger|tabloid|a4|a3)
-              fmgrConfigReplace config '^p' "p $3";;
-            "") echo "$help" >&2; rc=1;;
-            *)
-             echo "$progname: unknown PAPER \`$3' given as argument for \`$progname dvipdfm paper'" >&2
-             echo "$progname: try \`$progname dvipdfm paper' for help" >&2
-             rc=1 ;;
-          esac ;;
-        # texconfig dvipdfm ""
-        "")
-          echo "$help" >&2; rc=1 ;;
-        # texconfig dvipdfm <unknown>
-        *)
-          echo "$progname: unknown option \`$2' given as argument for \`$progname dvipdfm'" >&2
-          echo "$progname: try \`$progname dvipdfm' for help" >&2
-          rc=1
-          ;;
-      esac
-      ;;
-
     # texconfig dvipdfmx
     dvipdfmx)
       help="Usage: $progname dvipdfmx paper PAPER
@@ -1234,9 +1199,6 @@ Valid PAPER settings:
       if checkForBinary dvips >/dev/null && tcfmgr --cmd find --file config.ps >/dev/null 2>&1; then
         tcBatch dvips paper $pDvips
       fi
-      if checkForBinary dvipdfm >/dev/null && tcfmgr --cmd find --file config >/dev/null 2>&1; then
-        tcBatch dvipdfm paper $p
-      fi
       if checkForBinary dvipdfmx >/dev/null && tcfmgr --cmd find --file dvipdfmx.cfg >/dev/null 2>&1; then
         tcBatch dvipdfmx paper $p
       fi
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index 5836d79ca35..c9a391d4b60 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -127,8 +127,9 @@ instopt_adjustpath 0
 instopt_adjustrepo 0
 " >texlive.profile
 
-# silence warnings we do not need to see.
+# silence envvar warnings and the welcome message.
 TEXLIVE_INSTALL_ENV_NOCHECK=1; export TEXLIVE_INSTALL_ENV_NOCHECK
+TEXLIVE_INSTALL_NO_WELCOME=1; export TEXLIVE_INSTALL_NO_WELCOME
 
 tlnet_install_log=`pwd`/install.log
 echo "$0: Running test install (log: $tlnet_install_log)..."
@@ -164,9 +165,6 @@ unexpected_output=`cat $tlnet_install_log \
   | grep -Ev '^done running ' \
   | grep -Ev '^finished ' \
   | grep -Ev '^Welcome to TeX Live' \
-  | grep -Ev '^See' \
-  | grep -Ev '^ .*/index.html' \
-  | grep -Ev '^for links to documentation' \
   | grep -Ev '^The TeX Live web site' \
   | grep -Ev '^contains updates' \
   | grep -Ev '^TeX Live is a joint project of the TeX user groups' \