work on uninstall/remove merge

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

1 files changed, 18 insertions, 1 deletions

diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index c063efb51e6..8ff1215ff31 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -281,6 +281,7 @@ my %action_specification = (
   },
   "remove" => { 
     "options"  => {
+      "all" => 1,
       "backup" => 1,
       "backupdir" => "=s",
       "dry-run|n" => 1,
@@ -320,7 +321,6 @@ my %action_specification = (
     "function" => \&action_shell
   },
   "uninstall" => {
-    "options"  => { "force" => 1 },
     "run-post" => 0,
     "function" => \&action_uninstall
   },
@@ -1083,6 +1083,14 @@ sub backup_and_remove_package {
 }
 
 sub action_remove {
+  # if --all is given, pass on to uninstall_texlive
+  if ($opts{'all'}) {
+    if (@_) {
+      tlwarn("$prg: No additional arguments allowed with --all\n");
+      return($F_ERROR);
+    }
+    exit(uninstall_texlive());
+  }
   # we do the following:
   # - (not implemented) order collections such that those depending on
   #   other collections are first removed, and then those which only
@@ -5050,6 +5058,11 @@ Error message from creating MainWindow:
 #  UNINSTALL
 #
 sub action_uninstall {
+  tlwarn("$prg: Please use remove --all\n");
+  return($F_ERROR);
+}
+
+sub uninstall_texlive {
   if (win32()) {
     printf STDERR "Please use \"Add/Remove Programs\" from the Control Panel to removing TeX Live!\n";
     return ($F_ERROR);
@@ -8223,6 +8236,10 @@ package, dependencies are never removed.  Options:
 
 =over 4
 
+=item B<--all>
+
+Uninstalls all of TeX Live, synonym to the C<uninstall> action.
+
 =item B<--backup>
 
 =item B<--backupdir> I<directory>