sync installer messages and script checking

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

1 files changed, 13 insertions, 11 deletions

diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index 4ed1b34b48b..2e12ad7ee65 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -143,6 +143,7 @@ perl install-tl -location $tltry -profile texlive.profile \
 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 @@ unexpected_output=`cat $tlnet_install_log \
   | 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 ' \