summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-01 23:27:15 +0000
committerKarl Berry <karl@freefriends.org>2019-03-01 23:27:15 +0000
commitd5fb0c29224f3dab31a57ede3db1aff1ec646bfb (patch)
tree788c4b1de71d630e61cd7d9cc6ee9f9bb9474b1d /Master
parentbff88215edc7bb6ad7e3304605cac52dc011e7a7 (diff)
(check_env): ignore anything beginning with _,
notably __CF_USER_TEXT_ENCODING (Mojca mail 1 Mar 2019 08:08:46). git-svn-id: svn://tug.org/texlive/trunk@50189 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/install-tl17
1 files changed, 12 insertions, 5 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 5556f1fc58b..ca87f9947cd 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -2503,12 +2503,14 @@ sub check_env {
# check for tex-related envvars.
$::env_warns = "";
for my $evar (sort keys %origenv) {
- next if $evar =~ /^(_
+ next if $evar =~ /^(_.*
|.*PWD
- |GENDOCS_TEMPLATE_DIR|PATH|SHELLOPTS
- |PERL5LIB
- |INSTROOT
|ARGS
+ |GENDOCS_TEMPLATE_DIR
+ |INSTROOT
+ |PATH
+ |PERL5LIB
+ |SHELLOPTS
)$/x; # don't worry about these
if ("$evar $origenv{$evar}" =~ /tex/i) { # check both key and value
$::env_warns .= " $evar=$origenv{$evar}\n";
@@ -2703,6 +2705,11 @@ C<-no-gui> option.
The wizard mode user interface (default on Windows), asking only minimal
questions before installing all of TeX Live.
+=item C<expert>
+
+A generic name for, currently, C<perltk>; it may select a different GUI
+in the future.
+
=item C<perltk>
The expert GUI installer, providing access to more options.
@@ -2711,7 +2718,7 @@ Can also be invoked on Windows by running C<install-tl-advanced.bat>.
=item C<tcl>
An experimental GUI. It starts out simply, with the same options as
-the wizard installer, but a button 'Advanced' gives acces to almost
+the wizard installer, but a button 'Advanced' gives access to almost
all the options of the perltk GUI.
=back