From 0a137951fca97177e99f15c5a17edcbf4dd7ddf1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 9 Nov 2019 18:08:58 +0000 Subject: tl-update-nsis: can't remove tlpobj/ dir here. tl-update-tlcritical: remove it here instead, after running makensis. tltestnet: new --rebuild option to update test repository. git-svn-id: svn://tug.org/texlive/trunk@52707 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/tl-update-tlcritical | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'Master/tlpkg/bin/tl-update-tlcritical') diff --git a/Master/tlpkg/bin/tl-update-tlcritical b/Master/tlpkg/bin/tl-update-tlcritical index d172d196369..a5e2a6f128f 100755 --- a/Master/tlpkg/bin/tl-update-tlcritical +++ b/Master/tlpkg/bin/tl-update-tlcritical @@ -98,9 +98,21 @@ do_updater sh # update the Windows updater executable. echo "$0: running tl-update-nsis... (logfile: $TMPDIR/makensis.log)" +# +# we have to remove the tlpobj subdir ourselves, since it's created +# by tl-update-nsis, but read by makensis. (But if it already exists, +# don't remove it.) +tlpobj=$master/tlpkg/tlpobj +if test -d "$tlpobj"; then + keep_tlpobj=true +else + keep_tlpobj=false +fi +# tl-update-nsis >$TMPDIR/updater.nsi makensis $TMPDIR/updater.nsi >$TMPDIR/makensis.log rm -f $TMPDIR/updater.nsi +$keep_tlpobj || rm -rf $tlpobj do_updater exe echo $tlcrit: -- cgit v1.2.3