diff options
author | Karl Berry <karl@freefriends.org> | 2019-11-09 18:08:58 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-11-09 18:08:58 +0000 |
commit | 0a137951fca97177e99f15c5a17edcbf4dd7ddf1 (patch) | |
tree | 9c00c9b2ac9ffc023ba7cf5dc39222707fd8b357 /Master/tlpkg/bin/tl-update-tlcritical | |
parent | 24bb9e4fa5f638d0e535c4cdd8a87ea482b11490 (diff) |
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
Diffstat (limited to 'Master/tlpkg/bin/tl-update-tlcritical')
-rwxr-xr-x | Master/tlpkg/bin/tl-update-tlcritical | 12 |
1 files changed, 12 insertions, 0 deletions
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: |