summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-10-27 13:20:00 +0000
committerNorbert Preining <preining@logic.at>2008-10-27 13:20:00 +0000
commitf766fd30eb3886932b6d8a7f3debbf7adf20ea33 (patch)
treeddc6e37bc0adad981bfb4570439324de9dcb5403
parente016929f8993dbac12acc8031664e14e6fd7121b (diff)
Try to remove the last updater step stuff, including the .bat file itself
git-svn-id: svn://tug.org/texlive/trunk@11077 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl6
-rw-r--r--Master/tlpkg/TeXLive/TLWinGoo.pm1
2 files changed, 5 insertions, 2 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 628eafa4178..ffa8a1ab744 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -858,11 +858,13 @@ EOF
sub close_w32_updater {
if ($::updater_started) {
+ my $desktop_path = TeXLive::TLWinGoo::desktop_path();
+ $desktop_path =~ s!/!\\!g;
print $::UPDATER "del tlpkg\\installer\\tarsave.exe\n";
- #print $::UPDATER "del THE DESKTOP SHORTCUT\n";
+ print $::UPDATER "del \"$desktop_path\\TeX Live Updater Final Step.lnk\"\n";
print $::UPDATER "rem del /s /q temp\n";
print $::UPDATER "rem rmdir temp\n";
- print $::UPDATER "del ", $localtlpdb->root, '/tlpkg/installer/updater.bat', "\n";
+ print $::UPDATER "del \"\%~f0\"";
close ($::UPDATER);
# create a desktop shortcut
add_desktop_shortcut(
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm
index 76d7acfb184..3fd5bd92d9d 100644
--- a/Master/tlpkg/TeXLive/TLWinGoo.pm
+++ b/Master/tlpkg/TeXLive/TLWinGoo.pm
@@ -105,6 +105,7 @@ BEGIN {
&init_unshortbat
&create_uninstaller
&unregister_uninstaller
+ &desktop_path
);
# for testing also:
@EXPORT_OK = qw(