summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-02-14 18:51:30 +0000
committerKarl Berry <karl@freefriends.org>2021-02-14 18:51:30 +0000
commit9a776cf346f43f98516eae74054f843870d07dd9 (patch)
tree33122956f2c50fd8f3c5971803a4e8807c340a95 /Build
parent878ca3faa641b83150ddcdf9c5bdea188247036e (diff)
doc,sync
git-svn-id: svn://tug.org/texlive/trunk@57738 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/kpathsea/configure.ac2
-rw-r--r--Build/source/texk/tests/TeXLive/TLUtils.pm5
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl18
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl36
4 files changed, 31 insertions, 30 deletions
diff --git a/Build/source/texk/kpathsea/configure.ac b/Build/source/texk/kpathsea/configure.ac
index 14c204cf6f1..0851e82f011 100644
--- a/Build/source/texk/kpathsea/configure.ac
+++ b/Build/source/texk/kpathsea/configure.ac
@@ -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@tug.org>
+dnl Copyright 2015-2021 Karl Berry <tex-live@tug.org>
dnl Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index 64a49e2d216..aa5a00b3a7d 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -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 @@ BEGIN {
use Cwd;
use Getopt::Long;
use File::Temp;
-use File::Copy qw//;
use TeXLive::TLConfig;
@@ -3201,7 +3200,7 @@ sub _create_config_files {
}
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: $!");
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 08f53ab5f6f..fc72f09ba80 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -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 @@ BEGIN {
}
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 @@ Error message from creating MainWindow:
# 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 @@ sub uninstall_texlive {
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 @@ This script and its documentation were written for the TeX Live
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
diff --git a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
index c6403865704..1afe782355b 100755
--- a/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
+++ b/Build/source/texk/texlive/linked_scripts/tlshell/tlshell.tcl
@@ -2382,30 +2382,35 @@ proc populate_main {} {
.mn.opt.paper add command -label "[__ "Advanced"] ..." \
-command papersize_advanced
- if {[llength $::langs] > 1} {
+
+ if {$::tcl_platform(platform) ne "windows"} {
incr inx
- .mn.opt add cascade -label [__ "GUI language"] \
- -menu .mn.opt.lang
- menu .mn.opt.lang
+ set ::inx_platforms $inx
+ .mn.opt add command -label "[__ "Platforms"] ..." -command platforms_select
+ }
+
+ if {[llength $::langs] > 1} {
+ .mn add cascade -label [__ "GUI language"] \
+ -menu .mn.lang
+ menu .mn.lang
foreach l [lsort $::langs] {
if {$l eq $::lang} {
set mlabel "$l *"
} 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 @@ proc populate_main {} {
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