texlive[59031] Master/tlpkg/bin/tl-update-images: (trap): restore

[commits+karl at tug.org]

Revision: 59031
          http://tug.org/svn/texlive?view=revision&revision=59031
Author:   karl
Date:     2021-04-30 17:34:01 +0200 (Fri, 30 Apr 2021)
Log Message:
-----------
(trap): restore original release-texlive.txt on exit;
eliminate unused --master option for simplicity.

Modified Paths:
--------------
    trunk/Master/tlpkg/bin/tl-update-images

Modified: trunk/Master/tlpkg/bin/tl-update-images
===================================================================
--- trunk/Master/tlpkg/bin/tl-update-images	2021-04-29 23:48:31 UTC (rev 59030)
+++ trunk/Master/tlpkg/bin/tl-update-images	2021-04-30 15:34:01 UTC (rev 59031)
@@ -17,10 +17,6 @@
 unset CDPATH  # avoid output from cd
 umask 022
 
-lockfile=/dev/shm/cron.tlimg.lock  # so it'll go away on reboot
-lockfile -r 0 $lockfile || exit 1  # from procmail
-trap "rm -f $lockfile; exit 0;" 0 1 2 15
-
 NAME=texlive
 V=2021
 D=`date +%Y%m%d`
@@ -34,6 +30,20 @@
 master=`cd ../.. && /bin/pwd`
 test -z "$master" && exit 1
 
+lockfile=/dev/shm/cron.tlimg.lock  # so it'll go away on reboot
+lockfile -r 0 $lockfile || exit 1  # from procmail
+#
+release_savefile=/tmp/tluirt.txt
+release_livefile=$master/release-texlive.txt
+#
+# On exit, remove the lockfile and undo the release-texlive.txt without
+# using svn.
+#
+trap "set -x; rm -f $lockfile; \
+  test -s $release_savefile && cp $release_savefile $release_livefile; \
+  rm -f $release_savefile
+exit 0;" 0 1 2 15
+
 debug=${OVERRIDE_DEBUG-false}
 mkisofs="xorriso -read_mkisofsrc -as mkisofs"   # mkisofs
 makeinst=true
@@ -49,8 +59,7 @@
 while test $# -gt 0; do
   case $1 in
   --debug)     debug=true; quiet=;;
-  --help)      echo "$0: No help, use the source, sorry."; exit 0;;
-  --master=*)  master=`echo $1 | sed 's/.*=//'`;;
+  --help)      echo "$0: Helpless, use the source, sorry."; exit 0;;
   --mkisofs=*) mkisofs=`echo $1 | sed 's/.*=//'`;;
   --noinst)    makeinst=false;;
   --notar)     maketar=false;;
@@ -305,16 +314,13 @@
 
 # Add our exact version to the release file.  Ensure a line of its own,
 # although a blank line should already be there.
-rm -f /tmp/tluirt.txt
-cp $master/release-texlive.txt /tmp/tluirt.txt
-printf "\ntexlive-$D\n" >>$master/release-texlive.txt
+rm -f $release_savefile
+cp $release_livefile $release_savefile
+printf "\ntexlive-$D\n" >>$release_livefile
 
 $makeinst && MAKEINST
 $maketar && MAKETAR
 
-# Undo the version without using svn, in case it's been relocked.
-cp /tmp/tluirt.txt $master/release-texlive.txt
-
 exit 0
 
 # Until 2010, we also produced: