set PATH for fmtutil in check-fmttriggers, doc tweaks

git-svn-id: svn://tug.org/texlive/trunk@39098 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 63 insertions, 28 deletions

diff --git a/Master/tlpkg/bin/check-fmttriggers b/Master/tlpkg/bin/check-fmttriggers
index 6241b257468..50fffe8b225 100755
--- a/Master/tlpkg/bin/check-fmttriggers
+++ b/Master/tlpkg/bin/check-fmttriggers
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: check-files-by-format 36922 2015-04-18 22:40:06Z karl $
+# $Id$
 # Originally written by Norbert Preining and Karl Berry, 2015.  Public domain.
 # 
 # Determine the files on which each format (fmt/base) depends
@@ -8,12 +8,13 @@
 # then check that exactly those packages are listed as triggers in the
 #   corresponding tlpsrc files.
 
-my ($tlroot, $Master);
+my ($vc_id, $Master);
 
 BEGIN {
+  $vc_id = '$Id$';
   $^W = 1;
-  ($mydir = $0) =~ s,/[^/]*$,,;
-  $tlroot = "$mydir/../..";
+  (my $mydir = $0) =~ s,/[^/]*$,,;
+  my $tlroot = "$mydir/../..";
   unshift (@INC, "$tlroot/tlpkg");
   chomp ($Master = `cd $mydir/../.. && pwd`);
 }
@@ -30,12 +31,20 @@ my $prg = TeXLive::TLUtils::basename($0);
 my $opt_fmtdir = "/tmp/fmttriggers";
 my $opt_rerecord = 1;
 my $opt_help = 0;
+my $opt_version = 0;
 
 TeXLive::TLUtils::process_logging_options ();
-GetOptions ("fmtdir"     => \$opt_fmtdir,
-            "rerecord!"  => \$opt_rerecord,
-            "help|?"     => \$help) or pod2usage(1);
-pod2usage (-exitstatus => 0, -verbose => 2) if $help;
+GetOptions (
+  "fmtdir"     => \$opt_fmtdir,
+  "rerecord!"  => \$opt_rerecord,
+  "version"    => \$opt_version,
+  "help|?"     => \$help) || pod2usage(1);
+
+pod2usage ("-exitstatus" => 0, "-verbose" => 2) if $help;
+if ($opt_version) { print "$vc_id\n"; exit 0; } 
+
+$::installerdir = $Master;  # TLUtils.pm should be smarter
+$ENV{'PATH'} = "$Master/bin/" . TeXLive::TLUtils::platform() . ":$ENV{PATH}";
 
 exit (&main());
 
@@ -331,20 +340,24 @@ check-fmt-trigger [I<option>]...
 
 =over 4
 
-=item C<--fmtdir> I<dir>
+=item B<--fmtdir> I<dir>
 
 Rebuild formats in I<dir>; default C</tmp/fmttriggers>.  This directory
 is completely removed before rebuilding, so do not use any system
 directory.
 
-=item C<--no-rerecord>
+=item B<--no-rerecord>
 
 Do not rebuild all formats to remake the recorder files; the default
 (C<--rerecord>) is to do so.
 
-=item C<--help>
+=item B<--help>
+
+Display this documentation and exit.
+
+=item B<--version>
 
-Print this documentation and exit.
+Display version information and exit.
 
 =back
 
diff --git a/Master/tlpkg/bin/check-tlnet-consistency b/Master/tlpkg/bin/check-tlnet-consistency
index a1134afbd71..aed59e1e138 100755
--- a/Master/tlpkg/bin/check-tlnet-consistency
+++ b/Master/tlpkg/bin/check-tlnet-consistency
@@ -43,8 +43,7 @@ if ($opt_version) { print "$vc_id\n"; exit 0; }
 exit (&main());
 
 
-sub main
-{
+sub main {
   chomp(my $Master = `cd $mydir/../.. && pwd`);
   # set up the programs ...
   if ($opt_nosetup) {
@@ -271,9 +270,13 @@ default is C<./tlnet>.
 Does not try to setup the various programs, but uses I<xz> and I<tar>
 from path.
 
-=item B<-help>
+=item B<--help>
 
-Print this documentation and exit.
+Display this documentation and exit.
+
+=item B<--version>
+
+Display version information and exit.
 
 =back
 
diff --git a/Master/tlpkg/bin/tl-compare-tlpdbs b/Master/tlpkg/bin/tl-compare-tlpdbs
index 1a8c1a5afe1..4632280e9fb 100755
--- a/Master/tlpkg/bin/tl-compare-tlpdbs
+++ b/Master/tlpkg/bin/tl-compare-tlpdbs
@@ -1,10 +1,9 @@
 #!/usr/bin/env perl
-# Copyright 2008-2013 Norbert Preining
+# Copyright 2008-2015 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
 # compare two tlpdbs
-#
 
 BEGIN {
   $vc_id = '$Id$';
@@ -115,9 +114,18 @@ tl-compare-tlpdbs [I<option>]... <TLPDB1> [<TLPDB2>]
 
 =over 4
 
-=item B<-help>
+=item B<--all>
+
+Also compare packages C<texlive.infra> and C<tlperl.win32>, which are
+ignored by default.
+
+=item B<--help>
+
+Display this documentation and exit.
+
+=item B<--version>
 
-Print this documentation and exit.
+Display version information and exit.
 
 =back
 
diff --git a/Master/tlpkg/bin/tl-fix-container-infos b/Master/tlpkg/bin/tl-fix-container-infos
index 80f69dbbd11..cd2e03778fb 100755
--- a/Master/tlpkg/bin/tl-fix-container-infos
+++ b/Master/tlpkg/bin/tl-fix-container-infos
@@ -40,8 +40,7 @@ if ($opt_version) { print "$vc_id\n"; exit 0; }
 exit (&main());
 
 
-sub main
-{
+sub main {
   chomp(my $Master = `cd $mydir/../.. && pwd`);
 
   # check that we have a target db.
@@ -149,9 +148,13 @@ of containers to be compared against; default is C<.>.
 Does not try to setup the various programs, but uses I<xz> and I<tar>
 from the current path.
 
-=item B<-help>
+=item B<--help>
 
-Print this documentation and exit.
+Display this documentation and exit.
+
+=item B<--version>
+
+Display version information and exit.
 
 =back
 
diff --git a/Master/tlpkg/bin/tl-prune-platforms b/Master/tlpkg/bin/tl-prune-platforms
index 2d2acd0f00a..0536c3e9dab 100755
--- a/Master/tlpkg/bin/tl-prune-platforms
+++ b/Master/tlpkg/bin/tl-prune-platforms
@@ -124,9 +124,13 @@ tl-prune-platforms [I<option>] [I<platform>] ...
 
 =over 4
 
-=item B<-help>
+=item B<--help>
 
-Print this documentation and exit.
+Display this documentation and exit.
+
+=item B<--version>
+
+Display version information and exit.
 
 =back
 
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index 6f96d00996e..65b73b38bb4 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -443,9 +443,13 @@ Do not create any relocatable packages.
 Do not try to use the TL version of our basic programs such as I<xz>
 and I<tar>, but instead looks for them in the current path.
 
-=item B<-help>
+=item B<--help>
 
-Print this documentation and exit.
+Display this documentation and exit.
+
+=item B<--version>
+
+Display version information and exit.
 
 =back