summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-05-18 21:25:39 +0000
committerKarl Berry <karl@freefriends.org>2017-05-18 21:25:39 +0000
commitd633c2d1792e8990aaaef8cdd2543a561c63407f (patch)
treef0341d98109230b6d74318783a390fdadcac414d /Master/install-tl
parent9960d8fcf2ad756cc2efbcff1271c3c94f9adc32 (diff)
__ is not defined in install-tl; revert
git-svn-id: svn://tug.org/texlive/trunk@44407 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl34
1 files changed, 22 insertions, 12 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 51553c782f8..6b588ba6b61 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
# $Id$
#
-# Copyright 2007-2016
+# Copyright 2007-2017
# Reinhard Kotucha, Norbert Preining, Karl Berry, Siep Kroonenberg.
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -596,7 +596,8 @@ if ($opt_gui eq 'text' or
if ($::env_warns) { print STDERR $::env_warns; }
unless ($ENV{"TEXLIVE_INSTALL_NO_WELCOME"}) {
foreach my $t (@::welcome_arr) {
- print STDOUT "$t\n";
+ printf STDOUT sprintf (shift @$t, @$t);
+ print STDOUT "\n";
}
}
do_cleanup(); # sets $::LOGFILENAME if not already defined
@@ -2366,17 +2367,26 @@ EOF
#
sub create_welcome {
@::welcome_arr = ();
- push @::welcome_arr, __("\nWelcome to TeX Live!\n");
- push @::welcome_arr, __(
- "Documentation links: %s/index.html\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;\n
-please consider supporting it by joining the group best for you.\n
-The list of groups is on the web at https://tug.org/usergroups.html.",
- $::vars{'TEXDIR'});
+ push @::welcome_arr, (["\nWelcome to TeX Live!\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.",
- $::vars{'TEXDIR'}, $::vars{'TEXDIR'}, $::vars{'TEXDIR'},
- $::vars{'this_platform'});
+ 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'}];
}
}