From 22ea71d84d3cd13a2523c2ad951f22eff56ea91f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 21 Feb 2020 22:53:49 +0000 Subject: texdoc (20feb20) git-svn-id: svn://tug.org/texlive/trunk@53859 c570f23f-e606-0410-a88d-b1316a301751 --- .../texk/texlive/linked_scripts/texdoc/texdoc.tlu | 14 ++++++++------ .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 20 +++++++++++++++----- 2 files changed, 23 insertions(+), 11 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/texlive/linked_scripts/texdoc/texdoc.tlu b/Build/source/texk/texlive/linked_scripts/texdoc/texdoc.tlu index bc2139435a3..e16f2e4eb1a 100755 --- a/Build/source/texk/texlive/linked_scripts/texdoc/texdoc.tlu +++ b/Build/source/texk/texlive/linked_scripts/texdoc/texdoc.tlu @@ -16,13 +16,15 @@ kpse.set_program_name(arg[-1], 'texdoc') -- get realpath of this file local function realpath(p) if os.type == 'unix' then - local h = io.popen(string.format("realpath '%s'", p)) - local r = h:read('*a') - h:close() - return r:gsub('\n$', '') - else - return '' + local e = os.execute('which realpath >/dev/null 2>&1') + if e == 0 then + local h = io.popen(string.format("realpath '%s'", p)) + local r = h:read('*a') + h:close() + return r:gsub('\n$', '') + end end + return '' end local file = realpath(arg[0]) diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 76113849bdc..c08ad2c3339 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 53820 2020-02-17 03:23:13Z preining $ +# $Id: tlmgr.pl 53842 2020-02-19 07:28:40Z preining $ # # Copyright 2008-2020 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 53820 $'; -my $datrev = '$Date: 2020-02-17 04:23:13 +0100 (Mon, 17 Feb 2020) $'; +my $svnrev = '$Revision: 53842 $'; +my $datrev = '$Date: 2020-02-19 08:28:40 +0100 (Wed, 19 Feb 2020) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -6900,8 +6900,10 @@ END_NO_CHECKSUMS } # from here on only in non-machine-readable mode and not silent info("$prg: package repositories\n"); + my $show_verification_page_link = 0; my $verstat = ""; if (!$remotetlpdb->virtual_get_tlpdb('main')->is_verified) { + $show_verification_page_link = 1; $verstat = ": "; $verstat .= $VerificationStatusDescription{$remotetlpdb->virtual_get_tlpdb('main')->verification_status}; } @@ -6912,14 +6914,22 @@ END_NO_CHECKSUMS if ($t ne 'main') { $verstat = ""; if (!$remotetlpdb->virtual_get_tlpdb($t)->is_verified) { + my $tlpdb_ver_stat = $remotetlpdb->virtual_get_tlpdb($t)->verification_status; $verstat = ": "; - $verstat .= $VerificationStatusDescription{$remotetlpdb->virtual_get_tlpdb($t)->verification_status}; + $verstat .= $VerificationStatusDescription{$tlpdb_ver_stat}; + # if the db is not verified *but* was signed, give the page link info + if ($tlpdb_ver_stat != $VS_UNSIGNED) { + $show_verification_page_link = 1; + } } info("\t$t = " . $repos{$t} . " (" . ($remotetlpdb->virtual_get_tlpdb($t)->is_verified ? "" : "not ") . "verified$verstat)\n"); } } + if ($show_verification_page_link) { + info("For more about verification, see https://texlive.info/verification.html.\n"); + } return 1; } @@ -9989,7 +9999,7 @@ This script and its documentation were written for the TeX Live distribution (L) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 53820 2020-02-17 03:23:13Z preining $ +$Id: tlmgr.pl 53842 2020-02-19 07:28:40Z preining $ =cut # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html -- cgit v1.2.3