summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2018-06-27 16:10:39 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2018-06-27 16:10:39 +0000
commitd858cc4b88ffc2e842f0318dec5912f2fb5de8fd (patch)
tree4ae1bd6cb48963aa763d3f6f184bfb84fbd0737f
parent4ef55de3c3c99f260ee7f999b3782ceea77f1594 (diff)
Win32 console windows solved
git-svn-id: svn://tug.org/texlive/trunk@48098 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl20
1 files changed, 7 insertions, 13 deletions
diff --git a/Master/install-tl b/Master/install-tl
index afbaed7d155..56863efe87e 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -96,10 +96,13 @@ use strict;
@::WARNLINES = ();
# debugging communication with external gui: use shared logfile
-# (assumes unix)
+
+our $dblfile = "/tmp/dblog";
+$dblfile = $ENV{'TEMP'} . "\\dblog.txt" if ($^O=~/^MSWin/i);
+$dblfile = $ENV{'TMPDIR'} . "/dblog" if ($^O eq 'darwin');
sub dblog {
my $s = shift;
- open(my $dbf, ">>", "/tmp/dblog");
+ open(my $dbf, ">>", $dblfile);
print $dbf "PERL: $s\n";
close $dbf;
}
@@ -224,6 +227,8 @@ if ((defined $ARGV[0]) && $ARGV[0] eq "-from_ext_gui") {
select(STDOUT);
$| = 1;
+ # windows: suppress console windows when invoking other programs
+ Win32::SetChildShowWindow(0) if win32();
# ___, defined in this file, replaces the GUI translating function
*__ = \&::___;
}
@@ -598,23 +603,12 @@ if ($opt_profile eq "") {
if ($ret != $MENU_INSTALL) {
tlwarn("Unknown return value of run_menu: $ret\n");
exit(3);
- } elsif (win32() && $from_ext_gui) {
- create_profile($ENV{'tmpprofile'});
- exit;
- # the external gui will do the actual installation
- # from a temporary batchfile using this temporary profile,
- # this to prevent hundreds of dosboxes popping up
}
} else { # no interactive setting of options
*__ = \&::___;
if (!do_remote_init()) {
die ("Exiting installation.\n");
}
- if (win32() && $from_ext_gui) {
- # copy profile and let the gui restart the installation
- TeXLive::copy("-f", $opt_profile, $ENV{'tmpprofile'});
- exit;
- }
read_profile($opt_profile);
if ($from_ext_gui) {
print STDOUT "startinst\n";