summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-09-23 20:24:57 +0000
committerNorbert Preining <preining@logic.at>2008-09-23 20:24:57 +0000
commitdcd440a213f572351b34e92457ca152754553e6e (patch)
tree86c2fbde808330d6f9d47f369b924409f3ed4e89
parent6792fb263aea8d1bc8656a0224c2a954c071bf2b (diff)
fix the tlmgr --gui config etc start error
git-svn-id: svn://tug.org/texlive/trunk@10704 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl8
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgrgui/tlmgrgui-real.pl2
2 files changed, 5 insertions, 5 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index dd765ea315d..d042b118b9d 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1082,7 +1082,7 @@ sub init_local_db {
}
sub action_gui {
- my ($screen) = @_;
+ my ($guiscreen) = @_;
my $perlbin = "perl";
my $perlbinquote = "perl";
my $perlscript = "$Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl";
@@ -1105,11 +1105,11 @@ sub action_gui {
push @cmdline, "-v" if ($::opt_verbosity > 0);
push @cmdline, "-v" if ($::opt_verbosity > 1);
push @cmdline, "-q" if ($::opt_quiet > 0);
- if (defined($screen)) {
- if (($screen eq "install") || ($screen eq "update")) {
+ if (defined($guiscreen)) {
+ if (($guiscreen eq "install") || ($guiscreen eq "update")) {
push @cmdline, "--load";
}
- push @cmdline, "--screen", $screen;
+ push @cmdline, "--guiscreen", $guiscreen;
}
exec $perlbin @cmdline;
die("Cannot execute the GUI script\n");
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui-real.pl b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui-real.pl
index 272cba0cbb8..aababa9d4fb 100755
--- a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui-real.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui-real.pl
@@ -152,7 +152,7 @@ TeXLive::TLUtils::process_logging_options();
GetOptions("location=s" => \$opt_location,
"netarchive=s" => \$NetArchive,
"diskarchive=s" => \$DiskArchive,
- "screen=s" => \$opt_screen,
+ "guiscreen=s" => \$opt_screen,
"force" => \$opt_force,
"load" => \$opt_load,
"lang=s" => \$opt_lang,