texlive[71711] Master/tlpkg: move catalogue checkout to

[commits+karl at tug.org]

Revision: 71711
          https://tug.org/svn/texlive?view=revision&revision=71711
Author:   karl
Date:     2024-07-05 00:48:16 +0200 (Fri, 05 Jul 2024)
Log Message:
-----------
move catalogue checkout to /home/texlive/catalogue

Modified Paths:
--------------
    trunk/Master/tlpkg/bin/ctan2tl
    trunk/Master/tlpkg/bin/tl-check-fmtshare
    trunk/Master/tlpkg/bin/tl-update-docindex
    trunk/Master/tlpkg/bin/tl-update-tlpdb
    trunk/Master/tlpkg/bin/tlpkginfo
    trunk/Master/tlpkg/doc/releng.txt

Modified: trunk/Master/tlpkg/bin/ctan2tl
===================================================================
--- trunk/Master/tlpkg/bin/ctan2tl	2024-07-04 21:15:28 UTC (rev 71710)
+++ trunk/Master/tlpkg/bin/ctan2tl	2024-07-04 22:48:16 UTC (rev 71711)
@@ -95,10 +95,6 @@
   exit 1
 fi
 
-# trying to sync catalogue changes as much as possible.
-#catfile=/home/httpd/html/catalogue/entries/$letter/
-#svn update $catfile
-
 echo "$0: ctan dir for $pkg"
 echo "$0: is $ctan_dir"
 

Modified: trunk/Master/tlpkg/bin/tl-check-fmtshare
===================================================================
--- trunk/Master/tlpkg/bin/tl-check-fmtshare	2024-07-04 21:15:28 UTC (rev 71710)
+++ trunk/Master/tlpkg/bin/tl-check-fmtshare	2024-07-04 22:48:16 UTC (rev 71711)
@@ -258,6 +258,7 @@
   echo "$0: built fmtfile: `ls -l $fmtfile` (on `hostname`)"
   engineversion=`$enginedir/$engine --version | sed 1q`
   echo "$0:   with engine: $enginedir/$engine ($engineversion)"
+  echo "$0:  full command: $ecmd"
 
   # The TeX \command to exit a job immediately. Assume a LaTeX fmt
   # if "latex" is in the name, else plain (enough).

Modified: trunk/Master/tlpkg/bin/tl-update-docindex
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-docindex	2024-07-04 21:15:28 UTC (rev 71710)
+++ trunk/Master/tlpkg/bin/tl-update-docindex	2024-07-04 22:48:16 UTC (rev 71711)
@@ -14,9 +14,10 @@
 use TeXLive::TLPDB;
 use File::Basename;
 
-my $CATALOGUE_DIR = "/home/httpd/html/catalogue/entries";
+my $top_cat = $ENV{"TEX_CATALOGUE"} || "/home/texlive/catalogue";
+our $CATALOGUE_DIR = "$top_cat/entries";
 
-exit(main());
+exit (main());
 
 

 sub main {

Modified: trunk/Master/tlpkg/bin/tl-update-tlpdb
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-tlpdb	2024-07-04 21:15:28 UTC (rev 71710)
+++ trunk/Master/tlpkg/bin/tl-update-tlpdb	2024-07-04 22:48:16 UTC (rev 71711)
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # $Id$
-# Copyright 2007-2023 Norbert Preining
+# Copyright 2007-2024 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 # 
@@ -81,7 +81,7 @@
   }
 
   if (! $opt_catalogue) {
-    $opt_catalogue = "/home/httpd/html/catalogue";
+    $opt_catalogue = "/home/texlive/catalogue";
   }
 
   if ($opt_catalogue_compare) {
@@ -731,11 +731,11 @@
 
 =item B<--catalogue> I<Catalogue_dir>
 
-The I<Catalogue_file> must point to a valid TeX Catalogue checkout; the
-default is C</home/httpd/html/catalogue>.  If the directory is readable,
-the generated tlpobj files will contain information gathered from the
-TeX Catalogue.  To disable this, specify a nonexistent filename, e.g.,
-C<--catalogue=/nonesuch>.
+The I<Catalogue_file> must point to a valid TeX Catalogue checkout, with
+subdirectory C</entries>; the default is C</home/texlive/catalogue>. If
+the directory is readable, the generated tlpobj files will contain
+information gathered from the TeX Catalogue. To disable this, specify a
+nonexistent filename, e.g., C<--catalogue=/nonesuch>.
 
 =item B<--catalogue-compare> I<tlpdb>
 

Modified: trunk/Master/tlpkg/bin/tlpkginfo
===================================================================
--- trunk/Master/tlpkg/bin/tlpkginfo	2024-07-04 21:15:28 UTC (rev 71710)
+++ trunk/Master/tlpkg/bin/tlpkginfo	2024-07-04 22:48:16 UTC (rev 71711)
@@ -67,10 +67,11 @@
 sub ctaninfo {
   $CTAN = $ENV{"CTAN"} || "/home/ftp/tex-archive";
   $TMPDIR = $ENV{"TMPDIR"} || "/tmp";
-  $CATALOGUE = $ENV{"TEX_CATALOGUE"} || "/home/httpd/html/catalogue/entries";
+  my $top_cat = $ENV{"TEX_CATALOGUE"} || "/home/texlive/catalogue";
+  $CATALOGUE = "$top_cat/entries";
   -d "$CATALOGUE/k"
-    || die "$0: TEX_CATALOGUE ($CATALOGUE) must point to entries/ subdir"
-           . " of a TeX Catalogue checkout.\n";
+    || die "$0: TEX_CATALOGUE ($CATALOGUE) must point to the top level"
+           . " of a TeX Catalogue checkout (with entries/ subdir).\n";
   
   # erroneous or problematic tds files (when new, tell CTAN and author).
   # ieeeconf: capitals in directory names.

Modified: trunk/Master/tlpkg/doc/releng.txt
===================================================================
--- trunk/Master/tlpkg/doc/releng.txt	2024-07-04 21:15:28 UTC (rev 71710)
+++ trunk/Master/tlpkg/doc/releng.txt	2024-07-04 22:48:16 UTC (rev 71711)
@@ -362,7 +362,7 @@
 
 X1. Preserve Catalogue as of the freeze, for the sake of
     post-freeze updates, e.g.,
-      tar -C /home/httpd/html -czf ~karl/tmp/catalogue-freeze.tgz \
+      tar -C /home/texlive -czf ~karl/tmp/catalogue-freeze.tgz \
           --exclude-vcs catalogue
     If such post-freeze updates are required (let's hope not),
     see tlpkg/archive/tlnet-by-hand.txt.