summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-02-11 01:36:28 +0000
committerNorbert Preining <preining@logic.at>2009-02-11 01:36:28 +0000
commit38870aa3f85399010f2635bc58d83ec8dcb2d2cf (patch)
treea095c81c1a5d0aafa7bb755273aae823946d3331
parent3423445291427575351d3b1e2025f16f66f77c37 (diff)
move w32_updater to texmf/scripts/texlive/, and let the GUI exit if
updates have been prepared. git-svn-id: svn://tug.org/texlive/trunk@12136 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl2
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl16
-rw-r--r--Master/texmf/scripts/texlive/w32_updater.bat (renamed from Master/tlpkg/installer/w32_updater.cmd)2
-rw-r--r--Master/tlpkg/tlpsrc/bin-texlive.tlpsrc1
4 files changed, 13 insertions, 8 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 36087f9dc9f..6132a43c2e5 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1201,7 +1201,7 @@ sub write_w32_updater {
}
return 0 if ($opts{"dry-run"}); # nothing else to do
# write the updater script file
- open UPDATER, ">$root/tlpkg/installer/updater"
+ open UPDATER, ">$root/texmf/scripts/texlive/updater"
or die "Cannot create updater: $!";
print UPDATER '@echo off
setlocal enableextensions
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
index b7da39b5175..3dc9bac0098 100755
--- a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
@@ -106,6 +106,7 @@ $TRANS{'en'} = {
# new ones
backupdir => "Default backup directory",
autobackup => "Auto backup setting",
+ critupdates => "Updates for the tlmgr are present.\nInstallation and upgrades won't work without being forced.\nPlease select only (if listed) the bin-texlive and texlive.infra package\nand press \"update selected packages\".\nAfter that the Program Window will be closed and the update will be finished automatically."
};
@@ -494,8 +495,13 @@ sub update_selected_packages {
}
push @args, @_;
execute_action_gui(@args);
- reinit_local_tlpdb();
if (win32() && $updater_needed) {
+ # terminate here immediately so that we are sure the auto-updater
+ # is run immediately
+ # make sure we exit in finish(0)
+ $::gui_mode = 0;
+ finish(0);
+ # the following code is not reached anymore ...
my $t = ___"runupdater";
$t =~ s/TEXROOT/$Master/;
# TODO TODO TODO TODO
@@ -510,6 +516,7 @@ sub update_selected_packages {
# -text => $t,
# -buttons => [ ___"ok" ])->Show;
}
+ reinit_local_tlpdb();
# TODO TODO TODO
# we should give a warning window when something didn't work out!!!
}
@@ -602,11 +609,8 @@ sub create_update_list {
}
if ($criticalupdate) {
my $sw = $mw->DialogBox(-title => ___"warning", -buttons => [ ___"ok" ]);
- $sw->add("Label", -text => "Updates for the tlmgr are present.
-Installation and upgrades won't work without being forced.
-Please select only (if listed) the bin-texlive and texlive.infra package
-and press \"update selected packages\". Then quit the program."
- )->pack(-padx => "3m", -pady => "3m");
+ $sw->add("Label", -text => ___"critupdates")->pack(-padx => "3m",
+ -pady => "3m");
$sw->Show;
}
}
diff --git a/Master/tlpkg/installer/w32_updater.cmd b/Master/texmf/scripts/texlive/w32_updater.bat
index 1cdf21f77ee..cbd8982c6f3 100644
--- a/Master/tlpkg/installer/w32_updater.cmd
+++ b/Master/texmf/scripts/texlive/w32_updater.bat
@@ -47,7 +47,7 @@ if not exist "%logdir%\" (set logdir=temp)
rem cd to root
cd /d "%tlroot%"
rem create tar.exe backup
->nul copy /y "%~dp0tar.exe" "%~dp0tarsave.exe"
+>nul copy /y "tlpkg\installer\tar.exe" "tlpkg\installer\tarsave.exe"
rem set up perl environment
set "PERL5LIB=%tlroot%\tlpkg\tlperl\lib"
rem let's make sure that we can use dynamic variables
diff --git a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
index 6d7ab2034a8..b6aaebaf75e 100644
--- a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
@@ -24,3 +24,4 @@ binpattern f bin/${ARCH}/tlmgr
binpattern f bin/${ARCH}/rungs
binpattern f bin/win32/tl-w32-wrapper.texlua
binpattern f bin/win32/symlinks4cygwin.sh
+binpattern f/win32 texmf/scripts/texlive/w32_updater.bat