5 files changed, 19 insertions, 27 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tl-errmess.ps1 b/Master/texmf-dist/scripts/texlive/tl-errmess.ps1
new file mode 100644
index 00000000000..1c086ec0248
--- /dev/null
+++ b/Master/texmf-dist/scripts/texlive/tl-errmess.ps1
@@ -0,0 +1,2 @@
+Add-Type -AssemblyName PresentationFramework
+[System.Windows.MessageBox]::Show($env:runscript_error_message, 'Error', 'OK', 'Warning')
+\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/texlive/tl-errmess.vbs b/Master/texmf-dist/scripts/texlive/tl-errmess.vbs
deleted file mode 100644
index 6212afc4181..00000000000
--- a/Master/texmf-dist/scripts/texlive/tl-errmess.vbs
+++ /dev/null
@@ -1,7 +0,0 @@
-option explicit
-
-Dim wsh, envi
-
-Set wsh = wscript.CreateObject("wscript.shell")
-Set envi = wsh.environment("PROCESS")
-MsgBox envi("RUNSCRIPT_ERROR_MESSAGE"), vbcritical, "Error"
-\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/texlive/uninstall-windows.pl b/Master/texmf-dist/scripts/texlive/uninstall-windows.pl
index c194eda4b3b..e4a081387f3 100755
--- a/Master/texmf-dist/scripts/texlive/uninstall-windows.pl
+++ b/Master/texmf-dist/scripts/texlive/uninstall-windows.pl
@@ -26,9 +26,10 @@ if (@ARGV) {
 } else {
   my $askfile = $0;
   $askfile =~ s!^(.*)([\\/])([^\\/]*)$!$1$2!;
-  $askfile .= "uninstq.vbs";
-  $ans = system("wscript", $askfile);
-  # 0 means yes
+  $askfile .= "uninstq.ps1";
+  $ans = system("powershell", '-NoLogo', '-WindowStyle', 'hidden',
+       '-ExecutionPolicy', 'Bypass', $askfile);
+  # 0 means yes or ok
 }
 if ($ans) {
   exit(1);
diff --git a/Master/texmf-dist/scripts/texlive/uninstq.ps1 b/Master/texmf-dist/scripts/texlive/uninstq.ps1
new file mode 100644
index 00000000000..27746b01077
--- /dev/null
+++ b/Master/texmf-dist/scripts/texlive/uninstq.ps1
@@ -0,0 +1,13 @@
+Add-Type -AssemblyName PresentationFramework
+
+$msg = @"
+Really uninstall TeX Live?
+
+Please make sure that no TeX Live programs are still running!
+"@
+$ans = [System.Windows.MessageBox]::Show($msg, 'Confirm uninstall', 'OKCancel', 'Question')
+if ($ans -eq 1) {
+  exit 0
+} else {
+  exit 1
+}
+\ No newline at end of file
diff --git a/Master/texmf-dist/scripts/texlive/uninstq.vbs b/Master/texmf-dist/scripts/texlive/uninstq.vbs
deleted file mode 100644
index 382f4be3731..00000000000
--- a/Master/texmf-dist/scripts/texlive/uninstq.vbs
+++ /dev/null
@@ -1,17 +0,0 @@
-Dim ans
-ans = MsgBox( "Really uninstall TeX Live?" & vbcrlf & vbcrlf & _
-  "Please make sure that no TeX Live programs are still running!", _
-  36, "TeX Live uninstaller" )
-If ans <> vbYes Then
-  wscript.quit( 1 )
-Else
-  wscript.quit( 0 )
-End If
-
-' invocation from cmd.exe:
-'   start /wait uninstq.vbs
-' test errorlevel
-
-' invocation from perl:
-'   my $ans = system( "wscript", "uninstq.vbs" );
-' 0 means yes
-\ No newline at end of file