texlive[43885] Master: sync installer messages and script checking

[commits+karl at tug.org]

Revision: 43885
          http://tug.org/svn/texlive?view=revision&revision=43885
Author:   karl
Date:     2017-04-17 04:35:37 +0200 (Mon, 17 Apr 2017)
Log Message:
-----------
sync installer messages and script checking

Modified Paths:
--------------
    trunk/Master/install-tl
    trunk/Master/tlpkg/bin/tl-update-tlnet

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2017-04-16 23:51:14 UTC (rev 43884)
+++ trunk/Master/install-tl	2017-04-17 02:35:37 UTC (rev 43885)
@@ -2341,9 +2341,12 @@
   @::welcome_arr = ();
   push @::welcome_arr, (["\nWelcome to TeX Live!\n"]);
   push @::welcome_arr, [
-    "See %s/index.html for links to documentation.\nThe TeX Live web site (http://tug.org/texlive/)\ncontains any 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", $::vars{'TEXDIR'}];
+    "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",
+    $::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.", $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'this_platform'}];
+    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.",
+    $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'TEXDIR'},
+    $::vars{'this_platform'}];
   }
 }
 

Modified: trunk/Master/tlpkg/bin/tl-update-tlnet
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-tlnet	2017-04-16 23:51:14 UTC (rev 43884)
+++ trunk/Master/tlpkg/bin/tl-update-tlnet	2017-04-17 02:35:37 UTC (rev 43885)
@@ -143,6 +143,7 @@
 unexpected_output=`cat $tlnet_install_log \
   | sed '/The following environment variables/,/^ ------/d' \
   | grep -Ev '^ ------' \
+  | grep -Ev '^$' \
   | grep -Ev '^cryptographic signature of' \
   | grep -Ev '^Automated TeX Live installation using profile' \
   | grep -Ev '^Installing from:' \
@@ -162,18 +163,19 @@
   | grep -Ev '^running ' \
   | grep -Ev '^done running ' \
   | grep -Ev '^finished ' \
-  | grep -Ev '^ See' \
-  | grep -Ev '^  .*/index.html' \
-  | grep -Ev '^ for links to documentation' \
-  | grep -Ev '^ contains updates' \
-  | grep -Ev '^ TeX Live is a joint project of the TeX user groups' \
-  | grep -Ev '^ please consider supporting it by joining the group b' \
-  | grep -Ev '^ list of user groups is on the web at' \
-  | grep -Ev '^ Add ' \
-  | grep -Ev '^ Most importantly, add ' \
-  | grep -Ev '^ to your PATH for current and future sessions' \
+  | 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' \
+  | grep -Ev '^please consider supporting it by joining the group' \
+  | grep -Ev '^The list of user groups is available' \
+  | grep -Ev '^Add ' \
+  | grep -Ev '^Most importantly, add ' \
+  | grep -Ev '^to your PATH for current and future sessions' \
   | grep -Ev ' \(if not dynamically found\)' \
-  | grep -Ev '^ Welcome to TeX Live' \
   | grep -Ev 'install-tl: done' \
   | grep -Ev '^Logfile: ' \
   | grep -Ev '^Time used for installing ' \