diff options
| author | Norbert Preining <preining@logic.at> | 2008-04-18 12:45:02 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2008-04-18 12:45:02 +0000 |
| commit | 3b284f802aed2faf0c9f6f2416af26bdfa6dbc4e (patch) | |
| tree | 7dd21b1bff151c7acd2733d22fa1610378ff2287 | |
| parent | a94278f9e2c781a67d137e0df26c35592f60cb0b (diff) | |
fix for uninitialized value
git-svn-id: svn://tug.org/texlive/trunk@7495 c570f23f-e606-0410-a88d-b1316a301751
| -rwxr-xr-x | Master/install-tl.pl | 2 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLWinGoo.pm | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Master/install-tl.pl b/Master/install-tl.pl index 3b26dac48d5..6184770b6b5 100755 --- a/Master/install-tl.pl +++ b/Master/install-tl.pl @@ -1034,7 +1034,7 @@ sub do_win_registry_magic { register_script_type(".texlua", "%TEXBINDIR%/texlua.exe"); broadcast_env(); update_assocs(); - register_uninstaller() unless $opt_portable; + register_uninstaller("$vars{'TEXDIR'}") unless $opt_portable; } # diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm index 598e4df0e5c..01b23d3fac8 100644 --- a/Master/tlpkg/TeXLive/TLWinGoo.pm +++ b/Master/tlpkg/TeXLive/TLWinGoo.pm @@ -842,11 +842,12 @@ the uninstaller script. =cut sub register_uninstaller { + my $td = shift; my $uninst_key = $Registry -> Open((admin() ? "LMachine" : "CUser") . "/software/microsoft/windows/currentversion/uninstall/", {Access => KEY_ALL_ACCESS()}); my $k = $uninst_key->CreateKey("TeXLive/"); - my $td = ($vars{'TEXDIR'}) =~ s!/!\\!g; + $td =~ s!/!\\!g; $k->{"/DisplayName"} = "TeXLive ".$::texlive_release; $k->{"/UninstallString"} = "\"$td\\texmf\\scripts\\texlive\\tlmgr\" uninstall & del /q /s \"$td*.*\""; |