summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/install-tl7
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlnet24
2 files changed, 18 insertions, 13 deletions
diff --git a/Master/install-tl b/Master/install-tl
index b7c37100e3d..977a7519600 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -2341,9 +2341,12 @@ sub create_welcome {
@::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'}];
}
}
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 ' \