diff options
| -rwxr-xr-x | Master/texmf/scripts/texlive/tlmgr.pl | 16 | ||||
| -rw-r--r-- | Master/texmf/scripts/texlive/uninstall-win32.pl | 54 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLWinGoo.pm | 2 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/bin-texlive.tlpsrc | 2 |
4 files changed, 56 insertions, 18 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 8101ee9c4aa..dee1e083eaf 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -132,9 +132,6 @@ if ($action =~ m/^generate$/i) { } elsif ($action =~ m/^uninstall$/i) { $ret = action_uninstall(); exit(0); -} elsif ($action =~ m/^uninstallwin32$/i) { - $ret = action_uninstall_win32(); - exit(0); } else { die "Unknown action: $action"; } @@ -682,19 +679,6 @@ sub init_local_db { } } -sub action_uninstall_win32 { - if (win32()) { - remove_texbindirs_from_path(); - unsetenv_reg("TEXBINDIR"); - # unregister_script_type(".texlua"); - unregister_uninstaller(); - exit if is_vista(); - broadcast_env(); - update_assocs(); - } -} - - sub action_uninstall { if (win32()) { printf STDERR "Please use \"Add/Remove Programs\" from the Control Panel to removing TeX Live!\n"; diff --git a/Master/texmf/scripts/texlive/uninstall-win32.pl b/Master/texmf/scripts/texlive/uninstall-win32.pl new file mode 100644 index 00000000000..f74e425ef71 --- /dev/null +++ b/Master/texmf/scripts/texlive/uninstall-win32.pl @@ -0,0 +1,54 @@ +#!/usr/bin/env perl +# +# $Id: uninstall-win32.pl 7822 2008-05-03 14:42:15Z preining $ +# +# Copyright 2008 Norbert Preining +# +# GUI for tlmgr +# + +my $Master; + +BEGIN { + $^W = 1; + $Master = `kpsewhich -var-value=SELFAUTOPARENT`; + chomp($Master); + unshift (@INC, "$Master/tlpkg"); +} + +use TeXLive::TLWinGoo; +use Tk; +use Tk::Dialog; + +my $mw = MainWindow->new(-title => "remove tlmgr 2008"); + +$mw->Label(-text => "Do you really want to remove TeX Live 2008?")->pack; + +my $f = $mw->Frame; +$f->pack; + +$f->Button(-text => "Ok", + -command => sub { $mw->destroy; doit(); exit(0); })->pack(-side => 'left'); +$f->Button(-text => "Cancel", -command => sub { $mw->destroy; exit(0); })->pack(-side => 'left'); + +sub doit { + remove_texbindirs_from_path(); + unsetenv_reg("TEXBINDIR"); + # unregister_script_type(".texlua"); + unregister_uninstaller(); + exit if is_vista(); + broadcast_env(); + update_assocs(); +} + +Tk::MainLoop(); + +__END__ + + +### Local Variables: +### perl-indent-level: 2 +### tab-width: 2 +### indent-tabs-mode: nil +### End: +# vim:set tabstop=2 expandtab: # diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm index 858369d3ba7..75c793df353 100644 --- a/Master/tlpkg/TeXLive/TLWinGoo.pm +++ b/Master/tlpkg/TeXLive/TLWinGoo.pm @@ -866,7 +866,7 @@ sub create_uninstaller { echo Do you really want to remove TeX Live 2008? Type Ctrl-C to abort. pause set PERL5LIB= -\"$td\\tlpkg\\tlperl\\bin\\perl.exe\" \"$td\\texmf\\scripts\\texlive\\tlmgr.pl\" uninstallwin32 +\"$td\\tlpkg\\tlperl\\bin\\perl.exe\" \"$td\\texmf\\scripts\\texlive\\uninstall-win32.pl\" copy \"$td\\tlpkg\\installer\\uninst2.bat\" \"\%TEMP\%\" \"\%TEMP\%\\uninst2.bat\" UNEND diff --git a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc index fa6dcaeae47..95eedcc66d3 100644 --- a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc +++ b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc @@ -7,7 +7,7 @@ runpattern f texmf/fmtutil/fmtutil-hdr.cnf runpattern f texmf/scripts/texlive/generate-fmtutil.pl runpattern f texmf/scripts/texlive/generate-language.pl runpattern f texmf/scripts/texlive/generate-updmap.pl -runpattern f texmf/scripts/texlive/tl-package-manager.pl +runpattern f texmf/scripts/texlive/uninstall-win32.pl runpattern f texmf/scripts/texlive/tlmgr.pl runpattern f texmf/scripts/texlive/texconf.tlu runpattern f texmf/scripts/texlive/rungs.tlu |