From 7641777dc5cdae52eb91bd04f7fa1f5565803b4f Mon Sep 17 00:00:00 2001 From: Siep Kroonenberg Date: Mon, 1 Jul 2019 19:07:17 +0000 Subject: Eliminated superfluous 'endload' output git-svn-id: svn://tug.org/texlive/trunk@51520 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/Master/install-tl b/Master/install-tl index 1326f82d042..dace1d13740 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -31,6 +31,21 @@ BEGIN { unshift (@INC, "$::installerdir/tlpkg"); } +# debugging communication with external gui: use shared logfile + +our $dblfile = "/tmp/dblog"; +$dblfile = $ENV{'TEMP'} . "\\dblog.txt" if ($^O =~ /^MSWin/i); +$dblfile = $ENV{'TMPDIR'} . "/dblog" if ($^O eq 'darwin' + && exists $ENV{'TMPDIR'}); +sub dblog { + my $s = shift; + open(my $dbf, ">>", $dblfile); + print $dbf "PERL: $s\n"; + close $dbf; +} + +dblog(join("\n", @ARGV)); + # On unix, this run of install-tl may do duty as a wrapper for # install-tl-gui.tcl, which in its turn will start an actual run of install-tl. # Skip this wrapper block if we can easily rule out a tcl gui: @@ -170,19 +185,6 @@ use strict; # global list of warnings @::WARNLINES = (); -# debugging communication with external gui: use shared logfile - -our $dblfile = "/tmp/dblog"; -$dblfile = $ENV{'TEMP'} . "\\dblog.txt" if ($^O =~ /^MSWin/i); -$dblfile = $ENV{'TMPDIR'} . "/dblog" if ($^O eq 'darwin' - && exists $ENV{'TMPDIR'}); -sub dblog { - my $s = shift; - open(my $dbf, ">>", $dblfile); - print $dbf "PERL: $s\n"; - close $dbf; -} - # we play around with the environment, place to keep original my %origenv = (); @@ -703,7 +705,7 @@ if ($opt_profile eq "") { } read_profile($opt_profile); if ($from_ext_gui) { - print STDOUT "endload\n\n"; + #print STDOUT "endload\n\n"; print STDOUT "startinst\n"; } } -- cgit v1.2.3