diff options
Diffstat (limited to 'Master/install-tl')
| -rwxr-xr-x | Master/install-tl | 48 |
1 files changed, 34 insertions, 14 deletions
diff --git a/Master/install-tl b/Master/install-tl index 977a7519600..be8433e4826 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -593,9 +593,11 @@ if ($opt_gui eq 'text' or foreach my $t (@::WARNLINES) { print STDERR $t; } } if ($::env_warns) { print STDERR $::env_warns; } - foreach my $t (@::welcome_arr) { - printf STDERR sprintf (shift @$t, @$t); - print STDERR "\n"; + unless ($ENV{"TEXLIVE_INSTALL_NO_WELCOME"}) { + foreach my $t (@::welcome_arr) { + printf STDERR sprintf (shift @$t, @$t); + print STDERR "\n"; + } } do_cleanup(); # sets $::LOGFILENAME if not already defined if ($LOGFILENAME) { @@ -881,7 +883,7 @@ sub do_installation { #$errcount += 2; # check environment for possibly tex-related strings: - check_env(); + check_env() unless $ENV{"TEXLIVE_INSTALL_ENV_NOCHECK"}; # log, profile, temp files: do_cleanup(); @@ -1797,15 +1799,16 @@ sub read_profile { my $profilepath = shift; my %opts = @_; my %keyrename = ( - 'option_sys_bin' => 'tlpdbopt_sys_bin', - 'option_sys_man' => 'tlpdbopt_sys_man', - 'option_sys_info' => 'tlpdbopt_sys_info', 'option_doc' => 'tlpdbopt_install_docfiles', - 'option_src' => 'tlpdbopt_install_srcfiles', 'option_fmt' => 'tlpdbopt_create_formats', - 'option_path' => 'instopt_adjustpath', - 'option_letter' => 'instopt_letter', + 'option_src' => 'tlpdbopt_install_srcfiles', + 'option_sys_bin' => 'tlpdbopt_sys_bin', + 'option_sys_info' => 'tlpdbopt_sys_info', + 'option_sys_man' => 'tlpdbopt_sys_man', 'option_adjustrepo' => 'instopt_adjustrepo', + 'option_letter' => 'instopt_letter', + 'option_path' => 'instopt_adjustpath', + 'option_symlinks' => 'instopt_adjustpath', 'portable' => 'instopt_portable', ); @@ -2336,15 +2339,27 @@ EOF # This is an array of references to anonymous arrays of parameters for # either __ or sprintf: a localizable string, possibly with placeholders, # followed by parameters for those placeholders, if any. - +# sub create_welcome { @::welcome_arr = (); push @::welcome_arr, (["\nWelcome to TeX Live!\n"]); - push @::welcome_arr, [ - "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", + 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.", + 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'}]; } @@ -2763,6 +2778,11 @@ variables. Omit creating the ConTeXt cache. This is useful for redistributors. +=item C<TEXLIVE_INSTALL_NO_WELCOME> + +Omit printing the welcome message after successful installation, e.g., +for testing. + =item C<TEXLIVE_INSTALL_PREFIX> =item C<TEXLIVE_INSTALL_TEXDIR> |