summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2022-04-11 14:03:28 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2022-04-11 14:03:28 +0000
commit7491d0702248b2de23d3c54aad0aeaf70048ea25 (patch)
tree559f10daccd332b076b89669c9052bab611a06aa /Master/install-tl
parent8fa1fb00cf118395526220bbf9806d012a4fa79c (diff)
Darwin now default -gui text
git-svn-id: svn://tug.org/texlive/trunk@63001 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl8
1 files changed, 2 insertions, 6 deletions
diff --git a/Master/install-tl b/Master/install-tl
index bdc8e304ca5..862858c75fa 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -58,9 +58,7 @@ sub dblogsub {
if (($^O !~ /^MSWin/i) &&
# this wrapper is only for unix, since windows has its own wrapper
- ($#ARGV >= 0 || ($^O eq 'darwin')) &&
- # tcl parameter may still come, or tcl is default
- ($#ARGV < 0 || $ARGV[0] ne '-from_ext_gui')
+ ($#ARGV >= 0) && ($ARGV[0] ne '-from_ext_gui')
# this run is not invoked by tcl
) {
@@ -81,7 +79,7 @@ if (($^O !~ /^MSWin/i) &&
# build argument array @new_args for install-tl-gui.tcl.
# '-gui' or '-gui tcl' will not be copied to @new_args.
# quit scanning and building @new_args once tcl is ruled out.
- my $want_tcl = ($^O eq 'darwin');
+ my $want_tcl = 0;
my $asked4tcl = 0;
my $forbid = 0;
my @new_args = ();
@@ -127,8 +125,6 @@ if (($^O !~ /^MSWin/i) &&
}
# done scanning arguments
if ($want_tcl) {
- # Darwin: suppress deprecation warning
- $ENV{'TK_SILENCE_DEPRECATION'} = 1 if $^O eq 'darwin';
unshift (@new_args, "--");
unshift (@new_args, "$::installerdir/tlpkg/installer/install-tl-gui.tcl");
my @wishes = qw /wish wish8.7 wish8.6 wish8.5 tclkit/;