diff options
author | Karl Berry <karl@freefriends.org> | 2020-03-13 22:01:43 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-03-13 22:01:43 +0000 |
commit | 14a909a335d2307b2932a01710498f5f5b26e119 (patch) | |
tree | 869953f03bd08f5d863286eb55765923c27fdfed /Master | |
parent | c737a0ed703a6f06355aca6c5ded465c988f3aa3 (diff) |
tlmgr remove --all: also remove install-tl and texmfcnf.lua
git-svn-id: svn://tug.org/texlive/trunk@54286 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/scripts/texlive/NEWS | 4 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/texlive/tlmgr.pl | 19 |
2 files changed, 13 insertions, 10 deletions
diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS index e67a8b47198..7a1b29b638e 100644 --- a/Master/texmf-dist/scripts/texlive/NEWS +++ b/Master/texmf-dist/scripts/texlive/NEWS @@ -1,10 +1,12 @@ (This file public domain. Originally written by Norbert Preining and Karl Berry, 2010.) -<li>more specific verification error messages +<p><b>tlmgr 54285 (released 13mar20):</b> +<li>tlmgr remove --all also removes install-tl and texmfcnf.lua. <p><b>tlmgr 54118 (released 7mar20):</b> <li>re-initialize LWP connection after 5 errors. +<li>more specific verification error messages <p><b>tlmgr 53428 (released 17jan20):</b> <li>automatic retry of packages that fail to download. diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index e7d14399b7f..553b3a944db 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -5197,9 +5197,12 @@ sub uninstall_texlive { return ($F_ERROR); } return if !check_on_writable(); + + init_local_db(0); my $force = defined($opts{"force"}) ? $opts{"force"} : 0; if (!$force) { - print("If you answer yes here the whole TeX Live installation will be removed!\n"); + print("If you answer yes here the whole TeX Live installation here,\n", + "under ", $localtlpdb->root, ", will be removed!\n"); print "Remove TeX Live (y/N): "; my $yesno = <STDIN>; if ($yesno !~ m/^y(es)?$/i) { @@ -5208,13 +5211,12 @@ sub uninstall_texlive { } } print ("Ok, removing the whole installation:\n"); - init_local_db(); TeXLive::TLUtils::remove_symlinks($localtlpdb->root, $localtlpdb->platform(), $localtlpdb->option("sys_bin"), $localtlpdb->option("sys_man"), $localtlpdb->option("sys_info")); - # now do remove the rest + # now remove the rest system("rm", "-rf", "$Master/texmf-dist"); system("rm", "-rf", "$Master/texmf-doc"); system("rm", "-rf", "$Master/texmf-var"); @@ -5222,15 +5224,17 @@ sub uninstall_texlive { system("rm", "-rf", "$Master/bin"); system("rm", "-rf", "$Master/readme-html.dir"); system("rm", "-rf", "$Master/readme-txt.dir"); - for my $f (qw/doc.html index.html LICENSE.CTAN LICENSE.TL README - README.usergroups release-texlive.txt texmf.cnf/) { + for my $f (qw/doc.html index.html install-tl + LICENSE.CTAN LICENSE.TL README README.usergroups + release-texlive.txt texmf.cnf texmfcnf.lua/) { system("rm", "-f", "$Master/$f"); } if (-d "$Master/temp") { system("rmdir", "--ignore-fail-on-non-empty", "$Master/temp"); } unlink("$Master/install-tl.log"); - # should we do that???? + # if they want removal, give them removal. Hopefully they know how to + # regenerate any changed config files. system("rm", "-rf", "$Master/texmf-config"); system("rmdir", "--ignore-fail-on-non-empty", "$Master"); } @@ -6688,9 +6692,6 @@ sub action_shell { # 2 : not even TLPDB needs to be found # if we cannot read tlpdb, die if arg SHOULD_I_DIE is true. # -# if an argument is given and is true init_local_db will die if -# setting up of programs failed. -# sub init_local_db { my ($should_i_die) = @_; defined($should_i_die) or ($should_i_die = 0); |