summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/uninstall-win32.pl16
-rw-r--r--Master/tlpkg/TeXLive/TLWinGoo.pm3
2 files changed, 13 insertions, 6 deletions
diff --git a/Master/texmf-dist/scripts/texlive/uninstall-win32.pl b/Master/texmf-dist/scripts/texlive/uninstall-win32.pl
index d82bd38184f..71aa86652a4 100755
--- a/Master/texmf-dist/scripts/texlive/uninstall-win32.pl
+++ b/Master/texmf-dist/scripts/texlive/uninstall-win32.pl
@@ -19,11 +19,17 @@ use TeXLive::TLPOBJ;
use TeXLive::TLConfig;
use TeXLive::TLUtils;
-my $askfile = $0;
-$askfile =~ s!^(.*)([\\/])([^\\/]*)$!$1$2!;
-$askfile .= "uninstq.vbs";
-my $ans = system("wscript", $askfile);
-# 0 means yes
+my $ans;
+
+if (@ARGV) {
+ $ans = 0;
+} else {
+ my $askfile = $0;
+ $askfile =~ s!^(.*)([\\/])([^\\/]*)$!$1$2!;
+ $askfile .= "uninstq.vbs";
+ $ans = system("wscript", $askfile);
+ # 0 means yes
+}
if ($ans) {
exit(1);
} else {
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm
index 490ee6ac621..f5ccd83217a 100644
--- a/Master/tlpkg/TeXLive/TLWinGoo.pm
+++ b/Master/tlpkg/TeXLive/TLWinGoo.pm
@@ -1235,7 +1235,8 @@ set PERL_ROOT=
set PERL_SIGNALS=
set PERL_UNICODE=
-perl.exe \"$tdmain\\scripts\\texlive\\uninstall-win32.pl\"
+perl.exe \"$tdmain\\scripts\\texlive\\uninstall-win32.pl\" \%1
+
if errorlevel 1 goto :eof
rem test for taskkill and try to stop exit tray menu
taskkill /? >nul 2>&1