texlive[52442] Master/tlpkg/bin: check-tlnet-consistency: also rmdir

[commits+karl at tug.org]

Revision: 52442
          http://tug.org/svn/texlive?view=revision&revision=52442
Author:   karl
Date:     2019-10-19 18:08:59 +0200 (Sat, 19 Oct 2019)
Log Message:
-----------
check-tlnet-consistency: also rmdir $tempbase, else empty temp/
  directory is left behind in a new tlnet repo.
tl-update-images: try -e for xz for extra cpu-based compression.
tl-try-install: rewrite with options.

Modified Paths:
--------------
    trunk/Master/tlpkg/bin/check-tlnet-consistency
    trunk/Master/tlpkg/bin/tl-try-install
    trunk/Master/tlpkg/bin/tl-update-images

Modified: trunk/Master/tlpkg/bin/check-tlnet-consistency
===================================================================
--- trunk/Master/tlpkg/bin/check-tlnet-consistency	2019-10-19 16:06:42 UTC (rev 52441)
+++ trunk/Master/tlpkg/bin/check-tlnet-consistency	2019-10-19 16:08:59 UTC (rev 52442)
@@ -1,10 +1,10 @@
 #!/usr/bin/env perl
 # $Id$
-# Copyright 2008-2018 Norbert Preining
+# Copyright 2008-2019 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 # 
-# checks the consistency of a tlnet tlpkg/texlive.tlpdb and the .tlpobj
+# Checks the consistency of a tlnet tlpkg/texlive.tlpdb and the .tlpobj
 # included in the packages. Takes quite some time.
 
 BEGIN {
@@ -169,7 +169,7 @@
   }
   # system("rmdir --ignore-fail-on-non-empty $temp/tlpkg/tlpobj");
   # system("rmdir --ignore-fail-on-non-empty $temp/tlpkg");
-  system("rmdir --ignore-fail-on-non-empty $temp");
+  system("rmdir --ignore-fail-on-non-empty $temp $tempbase");
   if (@notlpobj) {
     print "packages without containing tlpobj file:\n";
     for my $p (@notlpobj) {

Modified: trunk/Master/tlpkg/bin/tl-try-install
===================================================================
--- trunk/Master/tlpkg/bin/tl-try-install	2019-10-19 16:06:42 UTC (rev 52441)
+++ trunk/Master/tlpkg/bin/tl-try-install	2019-10-19 16:08:59 UTC (rev 52442)
@@ -1,28 +1,65 @@
 #!/bin/sh
-# $Id$
-# Try a TL installation with various profiles into /tmp/ki. Public domain.
+# Public domain.
+# Try a TL installation into /tmp/ki (hardwired),
+# using install-tl with a given profile.
+vc_id='$Id$'
 
 renice 20 $$ >&/dev/null
 
-instdir=/tmp/ki # in .pro files too
-rm -rf $instdir* && echo "removed $instdir*."
+# don't let cwd or existing PATH interfere
+cd "$HOME" || exit 1
+PATH=/usr/local/bin:/usr/bin:/bin # /usr/local/bin for good perl on tug
 
-# make installations quieter.
-#TEXLIVE_INSTALL_ENV_NOCHECK=1; export TEXLIVE_INSTALL_ENV_NOCHECK
-#TEXLIVE_INSTALL_NO_WELCOME=1; export TEXLIVE_INSTALL_NO_WELCOME
-
 real0=`realpath $0`
 mydir=`cd \`dirname "$real0"\` && pwd`  # Master/tlpkg/bin
 Master=`cd $mydir/../.. && pwd`
 profiledir=$Master/tlpkg/dev/profiles
 
-# don't let cwd or existing PATH interfere
-cd "$HOME" || exit 1
-PATH=/usr/local/bin:/usr/bin:/bin # /usr/local/bin for good perl on tug
+profile=$profiledir/TLinfra.pro
+repo=$Master
 
+while test $# -gt 0; do
+  case $1 in
+  --profile) shift; profile=$1;;
+  --repo)    shift; repo=$1;;
+  --help)    echo "ustl. sorry."; exit 0;;
+  --version) echo "$vc_id"; exit 0;;
+  *) echo "$0: unrecognized option \`$1'." >&2
+     exit 1;;
+  esac
+  shift
+done
+
+if test ! -f "$profile"; then
+  # convenience silliness
+  if test -f "$profiledir/$profile"; then
+    profile=$profiledir/$profile
+  elif test -f "$profiledir/TL$profile"; then
+    profile=$profiledir/TL$profile
+  elif test -f "$profiledir/TL$profile.pro"; then
+    profile=$profiledir/TL$profile.pro
+  else
+    echo "$0: goodbye, no profile \`$profile' (not in $profiledir either)." >&2
+    exit 1
+  fi
+fi
+
+if test ! -x "$repo/install-tl"; then
+  echo "$0: goodbye, no install-tl in repository: $repo" >&2
+  exit 1
+fi
+
+instdir=/tmp/ki  # also specified in *.pro, so not enough to change it here.
+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
+
 set -x
-pro=--profile=${1-$profiledir/TLinfra.pro} #infra min ... full
-exec time $Master/install-tl $pro
+pro=--profile=$profile
+exec time $repo/install-tl $pro
+
 cust=--custom-bin=$wb
 exec time $Master/install-tl $cust $pro
 exec time $lp/install-tl $pro

Modified: trunk/Master/tlpkg/bin/tl-update-images
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-images	2019-10-19 16:06:42 UTC (rev 52441)
+++ trunk/Master/tlpkg/bin/tl-update-images	2019-10-19 16:08:59 UTC (rev 52442)
@@ -19,8 +19,8 @@
 renice +19 -p $$ >/dev/null 2>&1
 umask 0
 unset CDPATH  # avoid output from cd
-XZ_OPT=-6; export XZ_OPT # compression level, -9 for slowest-but-most,
-                         # which is not worth the (excessive) time.
+XZ_OPT=-6e; export XZ_OPT # compression level, -9 for slowest-but-most,
+                          # which is not worth the (excessive) time.
 
 mydir=`cd \`dirname $0\` && /bin/pwd`
 cd $mydir || exit 1  # the Master/tlpkg/bin directory