tlmgr.texlua, rmdir: added some quotes for Windows case.

Windows Add/Remove Programs still dysfunctional.


git-svn-id: svn://tug.org/texlive/trunk@7432 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 17 insertions, 17 deletions

diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index f70710c3868..7fe76045dce 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -1061,7 +1061,7 @@ sub do_win_registry_magic {
   register_script_type(".texlua", "%TEXBINDIR%/texlua.exe");
   broadcast_env();
   update_assocs();
-  #register_uninstaller() unless $opt_portable;
+  register_uninstaller() unless $opt_portable;
 }
 
 #
diff --git a/Master/texmf/scripts/texlive/tlmgr.texlua b/Master/texmf/scripts/texlive/tlmgr.texlua
index 60dbef70d13..89bb771b60a 100755
--- a/Master/texmf/scripts/texlive/tlmgr.texlua
+++ b/Master/texmf/scripts/texlive/tlmgr.texlua
@@ -27,7 +27,7 @@ function fixwin(args_unix)
   if os.type == 'windows' then
     local args_win={}  -- new table
     args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
+    for i=1, #args_unix do
       args_win[i]='"'..args_unix[i]..'"'
     end
     return args_win
@@ -37,7 +37,7 @@ function fixwin(args_unix)
 end
 
 function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
+  -- For Windows we use the shipped perl interpreter, otherwise we expect
   -- a perl to be installed
   if  os.type == 'windows' then
     perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
@@ -75,7 +75,7 @@ end
 function rmdir(name)
   if os.type == 'windows' then
     -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
+    os.execute('rmdir /s /q "' .. name:gsub('/', '\\')..'"')
   else
     ret = os.spawn({"rm", "-rf", name})
   end
@@ -110,13 +110,13 @@ end
 
 if  arg[1] == 'uninstall' then
   print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
+  io.stdout:write("Remove TeX Live (y/N): ")
   local yesno = io.read()
   if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
     print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
+    -- we have to call perl uninstall-tl.pl AND have to remove the following
     -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
+    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg,
     -- TEXDIR/install-tl.log, TEXMFSYSVAR
     -- that should remove all the stuff
     -- Or other options?
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm
index ee66076f315..598e4df0e5c 100644
--- a/Master/tlpkg/TeXLive/TLWinGoo.pm
+++ b/Master/tlpkg/TeXLive/TLWinGoo.pm
@@ -842,16 +842,16 @@ the uninstaller script.
 =cut
 
 sub register_uninstaller {
-#  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;
-#  $k->{"/DisplayName"} = "TeXLive ".$::texlive_release;
-#  $k->{"/UninstallString"} =
-#    "\"$td\\texmf\\scripts\\texlive\\uninstall-tl.bat\" & del /q /s \"$td*.*\"";
-#  $k->{'/DisplayVersion'} = $::texlive_release;
-#  $k->{'/URLInfoAbout'} = "http://www.tug.org/texlive";
+  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;
+  $k->{"/DisplayName"} = "TeXLive ".$::texlive_release;
+  $k->{"/UninstallString"} =
+    "\"$td\\texmf\\scripts\\texlive\\tlmgr\" uninstall & del /q /s \"$td*.*\"";
+  $k->{'/DisplayVersion'} = $::texlive_release;
+  $k->{'/URLInfoAbout'} = "http://www.tug.org/texlive";
 }
 
 =pod