7 files changed, 18 insertions, 18 deletions
diff --git a/Master/bin/win32/generate-fmtutil.texlua b/Master/bin/win32/generate-fmtutil.texlua
index 874d231cd28..1e16295e411 100755
--- a/Master/bin/win32/generate-fmtutil.texlua
+++ b/Master/bin/win32/generate-fmtutil.texlua
@@ -19,7 +19,7 @@ end
 
 basename=select(1, string.gsub(filename, "\.texlua$", ""))
 
-basename="generate-fmtutil"
+-- basename="generate-fmtutil"
 
 kpse.set_program_name(filename)
 
diff --git a/Master/bin/win32/generate-language.texlua b/Master/bin/win32/generate-language.texlua
index 352b85ccab3..1ecc6d507f4 100755
--- a/Master/bin/win32/generate-language.texlua
+++ b/Master/bin/win32/generate-language.texlua
@@ -19,7 +19,7 @@ end
 
 basename=select(1, string.gsub(filename, "\.texlua$", ""))
 
-basename="generate-language"
+-- basename="generate-language"
 
 kpse.set_program_name(filename)
 
diff --git a/Master/bin/win32/generate-updmap.texlua b/Master/bin/win32/generate-updmap.texlua
index 259efac8dd1..221f8f085df 100755
--- a/Master/bin/win32/generate-updmap.texlua
+++ b/Master/bin/win32/generate-updmap.texlua
@@ -19,7 +19,7 @@ end
 
 basename=select(1, string.gsub(filename, "\.texlua$", ""))
 
-basename="generate-updmap"
+-- basename="generate-updmap"
 
 kpse.set_program_name(filename)
 
diff --git a/Master/bin/win32/updmap-sys.texlua b/Master/bin/win32/updmap-sys.texlua
index e96be2fa700..b02ee2f6064 100755
--- a/Master/bin/win32/updmap-sys.texlua
+++ b/Master/bin/win32/updmap-sys.texlua
@@ -18,7 +18,7 @@ end
 
 basename=select(1, string.gsub(filename, "\.texlua$", ""))
 
-basename="updmap-sys"
+-- basename="updmap-sys"
 
 kpse.set_program_name(filename)
 
diff --git a/Master/bin/win32/updmap.texlua b/Master/bin/win32/updmap.texlua
index 408bb4d05e5..1f724087d30 100755
--- a/Master/bin/win32/updmap.texlua
+++ b/Master/bin/win32/updmap.texlua
@@ -18,7 +18,7 @@ end
 
 basename=select(1, string.gsub(filename, "\.texlua$", ""))
 
-basename="updmap"
+-- basename="updmap"
 
 kpse.set_program_name(filename)
 
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm
index 06a806a502c..4e1da8d25d5 100644
--- a/Master/tlpkg/TeXLive/TLWinGoo.pm
+++ b/Master/tlpkg/TeXLive/TLWinGoo.pm
@@ -422,7 +422,7 @@ sub register_script_type {
   $classes_key->ArrayValues(0);
   $classes_key->CreateKey($extension)->SetValue("","script".$extension);
   $classes_key->CreateKey("script".$extension."/Shell/Open/Command/")->
-    SetValue("", $command.' "%1" %*');
+    SetValue("", '"'.$command.'" "%1" %*');
 }
 
 =pod
diff --git a/Master/tlpkg/doc/wingoo-demo.pl b/Master/tlpkg/doc/wingoo-demo.pl
index c73e3626d64..8e7359e0041 100644
--- a/Master/tlpkg/doc/wingoo-demo.pl
+++ b/Master/tlpkg/doc/wingoo-demo.pl
@@ -103,19 +103,19 @@ print "tex.exe found in " .
 
 # the problem case: no admin, but TeX on system path
 
-if (!admin()) {
-  my $fn = expand_string("%windir%")."/TEX.EXE";
-  $fn =~ s/\\/\//g;
-  create_file($fn); # a tex.exe on the system path!
-  add_texbindir_to_path(expand_string($wr_dir2));
-  my @wge = wg_error();
-  if (@wge) {
-    print $wge[1]."\n";
-  }
-  print_search_paths();
-  print "tex.exe found in " . TeXLive::TLWinGoo::win_which_dir("tex.exe") . "\n";
-  unlink $fn;
+my $admin_save = $TeXLive::TLWinGoo::is_admin;
+$TeXLive::TLWinGoo::is_admin = 0;
+my $fn = expand_string("%windir%")."/TEX.EXE";
+$fn =~ s/\\/\//g;
+create_file($fn); # a tex.exe on the system path!
+add_texbindir_to_path(expand_string($wr_dir2));
+my @wge = wg_error();
+if (@wge) {
+  print $wge[1]."\n";
 }
+print_search_paths();
+print "tex.exe found in " . TeXLive::TLWinGoo::win_which_dir("tex.exe") . "\n";
+unlink $fn;
 
 # adding a filetype