tl-try-install,

tl-update-tlpdb,
releng.txt: doc.


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

3 files changed, 27 insertions, 20 deletions

diff --git a/Master/tlpkg/bin/tl-try-install b/Master/tlpkg/bin/tl-try-install
index cec38afe018..2587a2b029d 100755
--- a/Master/tlpkg/bin/tl-try-install
+++ b/Master/tlpkg/bin/tl-try-install
@@ -59,6 +59,7 @@ rm -rf $instdir* && echo "removed $instdir*."
 # make installations quieter.
 #TEXLIVE_INSTALL_ENV_NOCHECK=1; export TEXLIVE_INSTALL_ENV_NOCHECK
 #TEXLIVE_INSTALL_NO_WELCOME=1; export TEXLIVE_INSTALL_NO_WELCOME
+#TEXLIVE_INSTALL_PAPER=letter; export TEXLIVE_INSTALL_PAPER
 
 set -x
 pro=--profile=$profile
diff --git a/Master/tlpkg/bin/tl-update-tlpdb b/Master/tlpkg/bin/tl-update-tlpdb
index cc579960975..e4731c863cc 100755
--- a/Master/tlpkg/bin/tl-update-tlpdb
+++ b/Master/tlpkg/bin/tl-update-tlpdb
@@ -78,7 +78,7 @@ sub main {
     die "$prg: Master $opt_master not a directory, goodbye.\n";
   }
   if ($opt_fromfiles + $opt_fromgit + $opt_fromgitsvn > 1) {
-    die "$prg: only one option --from[lines|git|gitsvn] can be given.\n";
+    die "$prg: only one option of --from-[lines|git|gitsvn] can be given.\n";
   }
 
   if (! $opt_catalogue) {
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index 2cb283cb11a..9dfbff6ce5f 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -153,7 +153,8 @@ This was a one-time event, but left here as an example for the unknown future.
   catalogue_compare=true # maybe not every day?
 
 A. At some point, after tlnet freeze:
-  Update gpg expiration, see tlpkg/gpg/tl-key-extension.txt.
+  Update gpg expiration, see tlpkg/gpg/tl-key-extension.txt;
+    do not fail to do this, or the key will expire and cause lots of hassle.
   Run tl-update-linked-scripts to ensure consistency.
   In Master/tlpkg, update bundled Windows programs as needed:
     dviout texworks tlgs tlperl tlpsv
@@ -302,13 +303,14 @@ Q. After final build, to do total freeze:
   In cron.tl, set *_frozen=true.
   Also, set catalogue_compare=false now or at some point earlier.
   Don't disable the cron entry, since we want to see if any commits
-  are mistakenly made. Nothing more than svn update will happen
-  with everything frozen.
+   are mistakenly made. Nothing more than svn update will happen
+   with everything frozen.  
+  Also, in /l/bin/mirror-ctan, disable Catalogue updates,
+   to avoid unnecessary changes if we have to rebuild the final image.
 
 R. Ask for torrents to be created. In 2019,
-  Bou Salim <salimcollo7@gmail.com>
   Tim Stewart <timoteostewart1977@gmail.com>
-   volunteered to do it.
+  made the one that worked.
 
 
  III. Making the big release:
@@ -347,10 +349,13 @@ chgrp mactex *; chmod g+w *
 mkdir $hm/$this/
 cp -v Extras*.pdf MacTeXtras-*.zip $hm/$this
 
-- rest of tlnet:
+- move rest of tlnet to historic:
 cd /home/ftp/texlive/tlnet
+# depending on when it was created, the tlnet-final/ dir might not have
+# been 100% final, so might contain older versions of any packages that
+# got last-minute updates. No harm in either leaving them or removing them.
 diff -qr . $hx/$prev/tlnet-final # should be identical, so:
-rm -rf [a-z]*
+rm -rf [a-z]*  # yes, really, but double-check you're in the right directory...
 mv ../tlpretest/[a-z]* .
 update README (touch even if no real changes needed)
    and ../tlpretest/README (pretest over)
@@ -361,7 +366,7 @@ fx=/home/ftp/tex
 rm -f $fx/texlive/Source/*
 cp -a $tm/source/{install-tl,texlive-,w32tex-}*z $fx/texlive/Source/
 
-- update local CTAN area just to avoid mirroring everything back again:
+- update local CTAN area, just to avoid mirroring everything back again:
 cy=/home/ftp/tex-archive/systems
 rm -rf $cy/texlive/tlnet/*; cp -ar * $cy/texlive/tlnet/
 rm $cy/texlive/Images/*; cp -a ../Images/*.* $cy/texlive/Images/
@@ -372,15 +377,16 @@ cp -a $fx/protext/dist/* $cy/windows/protext/ # probably already done
 - historic copy of TL web pages:
 cd /home/httpd/html/texlive
 mkdir $hx/$prev/web/
-cp *.html !$  # remove tugstyle.css ref from bugs.html
+cp *.html !$  # disable header.html include in bugs.html
 
 - copy full (unpruned) tlpdb to historic:
 # the pre-pruned tlpdb directory is created by tl-update-images.
 preprune=/home/ftp/texlive/Images/test/preprune-tlpdb
-tgz=`pwd`/texlive-20190410-tlpdb-full.tar.gz
+ls -l $preprune
+tgz=/tmp/texlive-${this}0406-tlpdb-full.tar.gz # whatever date
 (cd $preprune && tar cvzf $tgz texlive.tlpdb texlive.tlpdb.*5*)
-mv $preprune/$tgz $hx/$this/
-rm -f $preprune
+mv $tgz $hx/$this/
+rm -rf $preprune
 
 - tug.org stuff:
 change fstab 
@@ -402,7 +408,7 @@ update ~www/texlive web pages (search for $prev and $prev-1):
   build.html - platform list
   custom-bin.html - remove any old, add any new
   doc.html - platform list, translation list
-  pretest.html - done for this year, maybe transfer bugs
+  pretest.html - done for this year, transfer bugs and news
   quickinstall.html - paths
   upgrade.html - whether possible or not
   tlmgr-news.html - from texmf-dist/scripts/texlive/NEWS
@@ -417,7 +423,7 @@ update historic/systems with final proTeXt, when ready.
   ~www/protext/index.html
 
 - announcements:
-CTAN @ ISO update: remove old version, re-enable tlnet mirroring.
+CTAN @ ISO update: remove old version, re-enable tlnet mirroring, MacTeX.
 Dick @ updating MacTeX.
 Siep @ windows.html, Norbert @ debian,updmap-kanji.html.
 pdftex maintainers @ updating pdftex sources with sync-pdftex.sh + tag.
@@ -430,9 +436,9 @@ Before: Determine revision number from svn log
  in case commits were mistakenly made.
 Also: look at https://tug.org/svn/texlive/tags/ to get subnum
  and https://tug.org/svn/texlive/branches/ to avoid duplication.
-rev=53984
+rev=54631
 subnum=0 # increase as necessary if multiple branches needed
-tlyear=`date +%Y`; echo $this # might be previous year during pretest, as above
+tlyear=`date +%Y`; echo $tlyear # maybe previous year during pretest, as above
 svn copy -r $rev \
  -m"texlive-$tlyear.$subnum tag based on r$rev" \
  svn://tug.org/texlive/trunk svn://tug.org/texlive/tags/texlive-$tlyear.$subnum
@@ -474,7 +480,7 @@ images_frozen=true
 net_frozen=false
 all_frozen=false
 
- after release:
+ after TC release:
 - texcollection
 hy=/home/ftp/historic/systems/texcollection
 mkdir -p $hy/$this/packaging
@@ -485,9 +491,9 @@ cd /mnt/tc
 cp -R [A-T]* index* setup /home/ftp/historic/systems/texcollection/$this
 #
 # copy ctan snapshot for TUG members:
-ls -l ~www/members/ctan18-*.tar
+ls -l ~www/members/ctan20-*.tar
 du !$
-rm -i ~www/members/ctan18-*.tar # assuming it's hard-linked, else move!
+rm -i ~www/members/ctan20-*.tar # assuming it's hard-linked, else move!
 nice -19 tar cf ~www/members/ctan`date +%y`-20180414.tar ctan
 chmod a=r ~www/members/ctan*.tar
 ls -l !$; du !$