texlive[57738] trunk: doc,sync

commits+karl at tug.org commits+karl at tug.org
Sun Feb 14 19:51:30 CET 2021


Revision: 57738
          http://tug.org/svn/texlive?view=revision&revision=57738
Author:   karl
Date:     2021-02-14 19:51:30 +0100 (Sun, 14 Feb 2021)
Log Message:
-----------
doc,sync

Modified Paths:
--------------
    trunk/Build/source/texk/kpathsea/configure.ac
    trunk/Build/source/texk/tests/TeXLive/TLUtils.pm
    trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
    trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
    trunk/Master/texmf-dist/scripts/texlive/NEWS

Property Changed:
----------------
    trunk/Build/source/texk/kpathsea/configure.ac

Modified: trunk/Build/source/texk/kpathsea/configure.ac
===================================================================
--- trunk/Build/source/texk/kpathsea/configure.ac	2021-02-14 00:47:48 UTC (rev 57737)
+++ trunk/Build/source/texk/kpathsea/configure.ac	2021-02-14 18:51:30 UTC (rev 57738)
@@ -1,7 +1,7 @@
 dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright 2015-2020 Karl Berry <tex-live at tug.org>
+dnl   Copyright 2015-2021 Karl Berry <tex-live at tug.org>
 dnl   Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
 dnl
 dnl   This file is free software; the copyright holder


Property changes on: trunk/Build/source/texk/kpathsea/configure.ac
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Build/source/texk/tests/TeXLive/TLUtils.pm
===================================================================
--- trunk/Build/source/texk/tests/TeXLive/TLUtils.pm	2021-02-14 00:47:48 UTC (rev 57737)
+++ trunk/Build/source/texk/tests/TeXLive/TLUtils.pm	2021-02-14 18:51:30 UTC (rev 57738)
@@ -5,7 +5,7 @@
 
 package TeXLive::TLUtils;
 
-my $svnrev = '$Revision: 56565 $';
+my $svnrev = '$Revision: 57421 $';
 my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
 sub module_revision { return $_modulerevision; }
 
@@ -224,7 +224,6 @@
 use Cwd;
 use Getopt::Long;
 use File::Temp;
-use File::Copy qw//;
 
 use TeXLive::TLConfig;
 
@@ -3201,7 +3200,7 @@
   }
   if ($usermode && -e $dest) {
     tlwarn("Updating $dest, backup copy in $dest.backup\n");
-    File::Copy::copy($dest, "$dest.backup");
+    copy("-f", $dest, "$dest.backup");
   }
   open(OUTFILE,">$dest")
     or die("Cannot open $dest for writing: $!");

Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl	2021-02-14 00:47:48 UTC (rev 57737)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl	2021-02-14 18:51:30 UTC (rev 57738)
@@ -1,12 +1,12 @@
 #!/usr/bin/env perl
-# $Id: tlmgr.pl 57424 2021-01-15 02:30:58Z preining $
+# $Id: tlmgr.pl 57705 2021-02-10 22:57:28Z karl $
 #
 # Copyright 2008-2020 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
-my $svnrev = '$Revision: 57424 $';
-my $datrev = '$Date: 2021-01-15 03:30:58 +0100 (Fri, 15 Jan 2021) $';
+my $svnrev = '$Revision: 57705 $';
+my $datrev = '$Date: 2021-02-10 23:57:28 +0100 (Wed, 10 Feb 2021) $';
 my $tlmgrrevision;
 my $tlmgrversion;
 my $prg;
@@ -93,6 +93,7 @@
 }
 
 use Cwd qw/abs_path/;
+use File::Find;
 use File::Spec;
 use Pod::Usage;
 use Getopt::Long qw(:config no_autoabbrev permute);
@@ -5239,7 +5240,8 @@
 
 
 # 
 UNINSTALL
-#
+# Return zero if successful, nonzero if failure.
+# 
 sub uninstall_texlive {
   if (win32()) {
     printf STDERR "Please use \"Add/Remove Programs\" from the Control Panel to removing TeX Live!\n";
@@ -5279,13 +5281,15 @@
     system("rm", "-f", "$Master/$f");
   }
   if (-d "$Master/temp") {
-    system("rmdir", "--ignore-fail-on-non-empty", "$Master/temp");
+    finddepth(sub { rmdir; }, "$Master/temp");
   }
   unlink("$Master/install-tl.log");
   # 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");
+  finddepth(sub { rmdir; }, "$Master");
+  
+  return -d "$Master";
 }
 
 
@@ -10113,7 +10117,7 @@
 distribution (L<https://tug.org/texlive>) and both are licensed under the
 GNU General Public License Version 2 or later.
 
-$Id: tlmgr.pl 57424 2021-01-15 02:30:58Z preining $
+$Id: tlmgr.pl 57705 2021-02-10 22:57:28Z karl $
 =cut
 
 # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html

Modified: trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl	2021-02-14 00:47:48 UTC (rev 57737)
+++ trunk/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl	2021-02-14 18:51:30 UTC (rev 57738)
@@ -2382,11 +2382,17 @@
   .mn.opt.paper add command -label "[__ "Advanced"] ..." \
       -command papersize_advanced
 
+
+  if {$::tcl_platform(platform) ne "windows"} {
+    incr inx
+    set ::inx_platforms $inx
+    .mn.opt add command -label "[__ "Platforms"] ..." -command platforms_select
+  }
+
   if {[llength $::langs] > 1} {
-    incr inx
-    .mn.opt add cascade -label [__ "GUI language"] \
-        -menu .mn.opt.lang
-    menu .mn.opt.lang
+    .mn add cascade -label [__ "GUI language"] \
+        -menu .mn.lang
+    menu .mn.lang
     foreach l [lsort $::langs] {
       if {$l eq $::lang} {
         set mlabel "$l *"
@@ -2393,19 +2399,18 @@
       } else {
         set mlabel $l
       }
-      .mn.opt.lang add command -label $mlabel \
+      .mn.lang add command -label $mlabel \
           -command "set_language $l"
     }
   }
 
-  incr inx
-  .mn.opt add cascade -label [__ "GUI font scaling"] \
-      -menu .mn.opt.fscale
-  menu .mn.opt.fscale
-  .mn.opt.fscale add command -label \
-      "[__ "Current"]:  [format {%.2f} $::tkfontscale]"
+  .mn add cascade -label [__ "GUI font scaling"] \
+      -menu .mn.fscale
+  menu .mn.fscale
+  .mn.fscale add command -label \
+      "[__ "Current:"]  [format {%.2f} $::tkfontscale]"
   foreach s {0.6 0.8 1 1.2 1.6 2 2.5 3 3.8 5 6 7.5 9} {
-    .mn.opt.fscale add command -label $s -command "set_fontscale $s"
+    .mn.fscale add command -label $s -command "set_fontscale $s"
   }
 
   # browser-style keyboard shortcuts for scaling
@@ -2422,13 +2427,6 @@
     bind . <Command-KeyRelease-0> {set_fontscale 1}
   }
 
-
-  if {$::tcl_platform(platform) ne "windows"} {
-    incr inx
-    set ::inx_platforms $inx
-    .mn.opt add command -label "[__ "Platforms"] ..." -command platforms_select
-  }
-
   .mn add cascade -label [__ "Help"] -menu .mn.help -underline 0
   menu .mn.help
   .mn.help add command -label [__ "About"] -command about_cmd

Modified: trunk/Master/texmf-dist/scripts/texlive/NEWS
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/NEWS	2021-02-14 00:47:48 UTC (rev 57737)
+++ trunk/Master/texmf-dist/scripts/texlive/NEWS	2021-02-14 18:51:30 UTC (rev 57738)
@@ -1,6 +1,9 @@
 (This file public domain.  Originally written by Norbert Preining and
 Karl Berry, 2010.)
 
+<p><b>tlmgr 57705 (released 12feb21):</b>
+<li>use pure Perl solution to rmdir TL tree for uninstall.
+
 <p><b>tlmgr 57424 (released 16jan21):</b>
 <li>usermode: pass -user to fmtutil.
 <li>remove dependency on File::Copy.



More information about the tex-live-commits mailing list.