diff options
author | Karl Berry <karl@freefriends.org> | 2016-04-26 17:41:35 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-04-26 17:41:35 +0000 |
commit | f9d4da10ff1b5c558ab037b7dc115a0117330474 (patch) | |
tree | 727a0cb184701f492d11669cbeaec40c5260fb0d /Build/source | |
parent | 19bc768fe06946bbdcec7b0ac846e827c3ebbf90 (diff) |
tl16 man page update
git-svn-id: svn://tug.org/texlive/trunk@40768 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
4 files changed, 42 insertions, 27 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl index 33d72693f4b..8d322d5b3b4 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# $Id: fmtutil.pl 40581 2016-04-17 21:37:08Z siepo $ +# $Id: fmtutil.pl 40678 2016-04-22 13:16:07Z siepo $ # fmtutil - utility to maintain format files. # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.) # @@ -24,11 +24,11 @@ BEGIN { TeX::Update->import(); } -my $svnid = '$Id: fmtutil.pl 40581 2016-04-17 21:37:08Z siepo $'; -my $lastchdate = '$Date: 2016-04-17 23:37:08 +0200 (Sun, 17 Apr 2016) $'; +my $svnid = '$Id: fmtutil.pl 40678 2016-04-22 13:16:07Z siepo $'; +my $lastchdate = '$Date: 2016-04-22 15:16:07 +0200 (Fri, 22 Apr 2016) $'; $lastchdate =~ s/^\$Date:\s*//; $lastchdate =~ s/ \(.*$//; -my $svnrev = '$Revision: 40581 $'; +my $svnrev = '$Revision: 40678 $'; $svnrev =~ s/^\$Revision:\s*//; $svnrev =~ s/\s*\$$//; my $version = "r$svnrev ($lastchdate)"; @@ -330,7 +330,9 @@ sub callback_build_formats { $foo = (($texmfvar =~ m!^//!) ? $tmp_deflt : $texmfvar) . "/temp.$$." . int(rand(1000000)); if (! -d $foo) { - if (mkdir($foo)) { + TeXLive::TLUtils::mkdirhier($foo); + sleep 1; + if (-d $foo) { $tmpdir = $foo; last; } diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index fa2e270e349..b0ab912665c 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,13 +1,13 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 40671 2016-04-21 23:11:29Z preining $ +# $Id: tlmgr.pl 40721 2016-04-24 13:05:42Z preining $ # # Copyright 2008-2016 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # -my $svnrev = '$Revision: 40671 $'; -my $datrev = '$Date: 2016-04-22 01:11:29 +0200 (Fri, 22 Apr 2016) $'; +my $svnrev = '$Revision: 40721 $'; +my $datrev = '$Date: 2016-04-24 15:05:42 +0200 (Sun, 24 Apr 2016) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -1382,6 +1382,11 @@ sub action_info { my $tlp = $localtlpdb->get_package($pkg); my $installed = 0; if (!$tlp) { + if ($opts{"only-installed"}) { + print "package: $pkg\n"; + print "installed: No\n"; + next; + } if (!$remotetlpdb) { init_tlmedia_or_die(); } @@ -1473,11 +1478,11 @@ sub action_info { if ($tlp->category ne "Collection" && $tlp->category ne "Scheme") { @colls = $localtlpdb->needed_by($pkg); if (!@colls) { - # not referenced in the local tlpdb, so try the remote here, too - if (!$remotetlpdb) { - init_tlmedia_or_die(); + if (!$opts{"only-installed"}) { + # not referenced in the local tlpdb, so try the remote here, too + init_tlmedia_or_die() if (!$remotetlpdb); + @colls = $remotetlpdb->needed_by($pkg); } - @colls = $remotetlpdb->needed_by($pkg); } } # some packages might depend on other packages, so do not @@ -5862,9 +5867,12 @@ sub _init_tlmedia { # this "location-url" line should not be changed since GUI programs # depend on it: - print "location-url\t$location\n" if $::machinereadable; - info("$prg: package repository $location (" . - ($remotetlpdb->is_verified ? "" : "not ") . "verified)\n"); + if ($::machinereadable) { + print "location-url\t$location\n"; + } else { + info("$prg: package repository $location (" . + ($remotetlpdb->is_verified ? "" : "not ") . "verified)\n"); + } return 1; } @@ -5927,6 +5935,9 @@ END_NO_INTERNET } elsif ($ret == -2) { # the remote database has not be signed, warn debug("$0: remote database is not signed, continuing anyway!\n"); + } elsif ($ret == -3) { + # no gpg available + debug("$0: no gpg available for verification, continuing anyway!\n"); } elsif ($ret == 1) { # no problem, checksum is wrong, we need to get new tlpdb } elsif ($ret == 2) { diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.am b/Build/source/texk/texlive/tl_scripts/Makefile.am index fe4a63279cc..c4ed887e197 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.am +++ b/Build/source/texk/texlive/tl_scripts/Makefile.am @@ -100,20 +100,21 @@ dist_web2c_DATA = fmtutil.cnf ## Generate the updmap/fmtutil man page using help2man plus a bit of ## handwritten material. But don't actually update updmap/fmtutil.1, -## we don't want to require help2man for an install. Leave that to be -## done by hand. +## since we don't want to require help2man for an install. Leave that +## to be done by hand. EXTRA_DIST += updmap.help2man fmtutil.help2man .PHONY: xmans xupdmap.1 xfmtutil.1 xmans: xupdmap.1 xfmtutil.1 -linked_scripts_dir = $(top_srcdir)/linked_scripts/texlive +Master_dir = $(top_srcdir)/../../../../Master +tl_scripts_dir = $(Master_dir)/texmf-dist/scripts/texlive ## -xupdmap.1: updmap.help2man $(linked_scripts_dir)/updmap.pl +xupdmap.1: updmap.help2man $(tl_scripts_dir)/updmap.pl help2man --include=$< --source="TeX Live" --no-info \ - $(linked_scripts_dir)/updmap.pl >/tmp/$@ + $(tl_scripts_dir)/updmap.pl >/tmp/$@ ## -xfmtutil.1: fmtutil.help2man $(linked_scripts_dir)/fmtutil.pl +xfmtutil.1: fmtutil.help2man $(tl_scripts_dir)/fmtutil.pl help2man --include=$< --source="TeX Live" --no-info \ - $(linked_scripts_dir)/fmtutil.pl >/tmp/$@ + $(tl_scripts_dir)/fmtutil.pl >/tmp/$@ ## diff --git a/Build/source/texk/texlive/tl_scripts/Makefile.in b/Build/source/texk/texlive/tl_scripts/Makefile.in index 9bc95865e8e..d3736463370 100644 --- a/Build/source/texk/texlive/tl_scripts/Makefile.in +++ b/Build/source/texk/texlive/tl_scripts/Makefile.in @@ -323,7 +323,8 @@ dist_texconfig_SCRIPTS = tcfmgr dist_texconfig_DATA = tcfmgr.map web2cdir = $(datarootdir)/texmf-dist/web2c dist_web2c_DATA = fmtutil.cnf -linked_scripts_dir = $(top_srcdir)/linked_scripts/texlive +Master_dir = $(top_srcdir)/../../../../Master +tl_scripts_dir = $(Master_dir)/texmf-dist/scripts/texlive # texlinks_prog = $(DESTDIR)$(bindir)/texlinks # @@ -860,12 +861,12 @@ uninstall-man1-links: done .PHONY: xmans xupdmap.1 xfmtutil.1 xmans: xupdmap.1 xfmtutil.1 -xupdmap.1: updmap.help2man $(linked_scripts_dir)/updmap.pl +xupdmap.1: updmap.help2man $(tl_scripts_dir)/updmap.pl help2man --include=$< --source="TeX Live" --no-info \ - $(linked_scripts_dir)/updmap.pl >/tmp/$@ -xfmtutil.1: fmtutil.help2man $(linked_scripts_dir)/fmtutil.pl + $(tl_scripts_dir)/updmap.pl >/tmp/$@ +xfmtutil.1: fmtutil.help2man $(tl_scripts_dir)/fmtutil.pl help2man --include=$< --source="TeX Live" --no-info \ - $(linked_scripts_dir)/fmtutil.pl >/tmp/$@ + $(tl_scripts_dir)/fmtutil.pl >/tmp/$@ .PHONY: run-texlinks # |