summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-04-17 15:42:57 +0000
committerKarl Berry <karl@freefriends.org>2017-04-17 15:42:57 +0000
commit91e87294ea67b2803d17d2cff0fe4d222a946770 (patch)
tree8c38fbb85888b5db724b6b8984ef1f8b0056ff56 /Master/tlpkg
parent4698cfbc1ee4e2f5b8a1fc3ff4e215bb03421e4c (diff)
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
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlnet6
1 files changed, 2 insertions, 4 deletions
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' \