summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-05-06 20:54:57 +0000
committerNorbert Preining <preining@logic.at>2008-05-06 20:54:57 +0000
commit16d27d4df6bf67377af3c47f13e433590792842b (patch)
tree5b6d75c1101665483543e3a8d6904e0673df84df /Master
parent8f27e661c380b795bac3738d1ae183559d4b4018 (diff)
fixes to make win32 happy
git-svn-id: svn://tug.org/texlive/trunk@7900 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl12
-rw-r--r--Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl4
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl3
3 files changed, 13 insertions, 6 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 41577179d31..daf7e75894b 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -95,21 +95,25 @@ $DiskArchive = $opt_diskarchive if (defined($opt_diskarchive));
if (defined($action) && ($action =~ m/^gui/i)) {
my $perlbin = "perl";
+ my $perlbinquote = "perl";
my $perlscript = "$Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl";
if ($^O=~/^MSWin(32|64)$/i) {
$ENV{'PERL5LIB'} = "$Master/tlpkg/tlperl/lib";
- $perlbin = "\"$Master/tlpkg/tlperl/bin/perl.exe\"";
+ $perlbin = "$Master/tlpkg/tlperl/bin/perl.exe";
+ $perlbinquote = "\"$Master/tlpkg/tlperl/bin/perl.exe\"";
+ $perlbinquote =~ s!/!\\!g;
$perlscript = "\"$perlscript\"";
+ $perlscript =~ s!/!\\!g;
}
my @cmdline;
- push @cmdline, $perlbin, $perlscript;
+ push @cmdline, $perlbinquote, $perlscript;
push @cmdline, "--location", "$opt_location"
if (defined($opt_location));
push @cmdline, "--netarchive", "$opt_netarchive"
if (defined($opt_netarchive));
push @cmdline, "--diskarchive", "$opt_diskarchive"
if (defined($opt_diskarchive));
- exec(@cmdline);
+ exec $perlbin @cmdline;
die("Cannot execute the GUI script\n");
}
@@ -478,7 +482,7 @@ sub action_update {
@todo = @ARGV;
}
if (!@todo) {
- printf "tlmgr update takes either a list of packages or --all\";
+ printf "tlmgr update takes either a list of packages or --all\n";
}
foreach my $pkg (@todo) {
next if ($pkg =~ m/^00texlive/);
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl b/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl
index 572d7311892..8cc57fd95d2 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/gui-uninstall.pl
@@ -20,8 +20,8 @@ if ($^O=~/^MSWin(32|64)$/i) {
$f->pack(-padx => "10m", -pady => "5m");
my $ok = $f->Button(-text => "Ok",
-command => sub {
- system("\"$Master/tlpkg/installer/uninst.bat\"");
- exit(0);
+ exec("\"$Master/tlpkg/installer/uninst.bat\"");
+ die("Cannot execute the uninstall script");
});
$ok->pack(-side => 'left', -padx => "3m");
} else {
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
index b30df7ab896..841af7c5f0f 100755
--- a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
@@ -200,6 +200,9 @@ sub find_next_search_match {
my ($w, $e, $iw, @l) = @_;
# first get the current selection
my @cursel = $w->curselection;
+ if (!@cursel) {
+ push @cursel, 0;
+ }
my $str = $e->get;
my $found = -1;
for (my $i = $cursel[0] + 1; $i < @l; $i++) {