summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2018-03-23 22:22:46 +0000
committerNorbert Preining <preining@logic.at>2018-03-23 22:22:46 +0000
commitd98e3cee2adc9eccb3eba9592a9952dfca51e819 (patch)
treee3f66148a171ed5c8217dfaf956a025d6e03f231
parent3b2203e5eef9bded6be3b913efed5e7fc194a1f8 (diff)
merge remove and uninstall
git-svn-id: svn://tug.org/texlive/trunk@47092 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl27
1 files changed, 7 insertions, 20 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 8ff1215ff31..ed3b242f24a 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -320,10 +320,6 @@ my %action_specification = (
"shell" => {
"function" => \&action_shell
},
- "uninstall" => {
- "run-post" => 0,
- "function" => \&action_uninstall
- },
"update" => {
"options" => {
"all" => 1,
@@ -478,6 +474,10 @@ sub main {
if (defined $action && $action =~ /^(show|list)$/) {
$action = "info";
}
+ # merge actions remove and uninstall
+ if (defined $action && $action eq "uninstall") {
+ $action = "remove";
+ }
# now $action should be part of %actionoptions, otherwise this is
# an error
@@ -1085,7 +1085,7 @@ sub backup_and_remove_package {
sub action_remove {
# if --all is given, pass on to uninstall_texlive
if ($opts{'all'}) {
- if (@_) {
+ if (@ARGV) {
tlwarn("$prg: No additional arguments allowed with --all\n");
return($F_ERROR);
}
@@ -5057,11 +5057,6 @@ 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";
@@ -8238,7 +8233,7 @@ package, dependencies are never removed. Options:
=item B<--all>
-Uninstalls all of TeX Live, synonym to the C<uninstall> action.
+Uninstalls all of TeX Live.
=item B<--backup>
@@ -8476,15 +8471,7 @@ If I<var> or then I<val> is not specified, it is prompted for.
=head2 uninstall
-Uninstalls the entire TeX Live installation. Options:
-
-=over 4
-
-=item B<--force>
-
-Do not ask for confirmation, remove immediately.
-
-=back
+Synonym for C<remove>.
=head2 update [I<option>]... [I<pkg>]...