summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-05-27 19:30:08 +0000
committerKarl Berry <karl@freefriends.org>2024-05-27 19:30:08 +0000
commitab7200a827c60dd7e1684b60f79c1a60a1c0c5bc (patch)
tree7400ea9171470a2fb1d94f2ad9d2104addfac060 /Build
parent76576e2aa4eae12ccb2c8886d7a7c26091860173 (diff)
l3build (27may24)
git-svn-id: svn://tug.org/texlive/trunk@71371 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/texlive/linked_scripts/l3build/l3build.lua2
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl39
2 files changed, 24 insertions, 17 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
index 5b40bc51115..bb53a2ce55a 100644
--- a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
+++ b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua
@@ -25,7 +25,7 @@ for those people who are interested.
--]]
-- Version information
-release_date = "2024-02-08"
+release_date = "2024-05-27"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 1d4315f3cee..9aa6a5f8e3e 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 71079 2024-04-25 22:15:30Z karl $
+# $Id: tlmgr.pl 71331 2024-05-24 07:30:36Z preining $
# Copyright 2008-2024 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -8,8 +8,8 @@
use strict; use warnings;
-my $svnrev = '$Revision: 71079 $';
-my $datrev = '$Date: 2024-04-26 00:15:30 +0200 (Fri, 26 Apr 2024) $';
+my $svnrev = '$Revision: 71331 $';
+my $datrev = '$Date: 2024-05-24 09:30:36 +0200 (Fri, 24 May 2024) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -1821,6 +1821,22 @@ sub action_info {
# SEARCH
#
+sub format_search_tlpdb_result {
+ my $ret = shift;
+ my $retfile = '';
+ my $retdesc = '';
+ for my $pkg (sort keys %{$ret->{"packages"}}) {
+ $retdesc .= "$pkg - " . $ret->{"packages"}{$pkg} . "\n";
+ }
+ for my $pkg (sort keys %{$ret->{"files"}}) {
+ $retfile .= "$pkg:\n";
+ for my $f (@{$ret->{"files"}{$pkg}}) {
+ $retfile .= "\t$f\n";
+ }
+ }
+ return ($retfile, $retdesc);
+}
+
sub action_search {
my ($r) = @ARGV;
my $tlpdb;
@@ -1855,17 +1871,7 @@ sub action_search {
my $json = TeXLive::TLUtils::encode_json($ret);
print($json);
} else {
- my $retfile = '';
- my $retdesc = '';
- for my $pkg (sort keys %{$ret->{"packages"}}) {
- $retdesc .= "$pkg - " . $ret->{"packages"}{$pkg} . "\n";
- }
- for my $pkg (sort keys %{$ret->{"files"}}) {
- $retfile .= "$pkg:\n";
- for my $f (@{$ret->{"files"}{$pkg}}) {
- $retfile .= "\t$f\n";
- }
- }
+ my ($retfile, $retdesc) = format_search_tlpdb_result($ret);
print ($retdesc);
print ($retfile);
}
@@ -4328,7 +4334,8 @@ sub show_one_package_detail {
}
# we didn't find a package like this, so use search
info("$prg: cannot find package $pkg, searching for other matches:\n");
- my ($foundfile, $founddesc) = search_tlpdb($remotetlpdb,$pkg,1,1,0);
+ my $ret = search_tlpdb($remotetlpdb,$pkg,1,1,0);
+ my ($foundfile, $founddesc) = format_search_tlpdb_result($ret);
print "\nPackages containing \`$pkg\' in their title/description:\n";
print $founddesc;
print "\nPackages containing files matching \`$pkg\':\n";
@@ -10584,7 +10591,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 71079 2024-04-25 22:15:30Z karl $
+$Id: tlmgr.pl 71331 2024-05-24 07:30:36Z preining $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html