diff options
Diffstat (limited to 'Master/tlpkg/bin/tl-update-tlnet')
-rwxr-xr-x | Master/tlpkg/bin/tl-update-tlnet | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index e9deda32076..ce3eff07b9a 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -268,12 +268,13 @@ fi # more consistency checks. if test $failure = false; then for cmd in \ + "$Master/tlpkg/bin/tlgpg-verify $tltry/tlpkg/texlive.tlpdb" \ + "$Master/tlpkg/bin/tl-compare-tlpdbs $critical $tltry/tlpkg/texlive.tlpdb" \ + "$Master/tlpkg/bin/tl-check-symlinks $tltryinst/$yyyy/bin" \ "$tltryinst/$yyyy/bin/*/tlmgr --repository $tltry update --list" \ "$tltryinst/$yyyy/bin/*/updmap-sys -n" \ "$tltryinst/$yyyy/bin/*/mktexlsr -n --verbose" \ - "$Master/tlpkg/bin/tl-check-symlinks $tltryinst/$yyyy/bin" \ "$Master/tlpkg/bin/tl-check-tlnet-consistency --location=$tltry" \ - "$Master/tlpkg/bin/tl-compare-tlpdbs $critical $tltry/tlpkg/texlive.tlpdb" \ ; do cmdname=`echo "$cmd" | awk '{print $1}'` if echo "$cmdname" | grep check-tlnet-consistency >/dev/null; then @@ -313,7 +314,7 @@ test ! -r $install_tl_log || cp -f $install_tl_log /tmp if $failure || $chicken; then echo >&2 - echo "$prg: Our transcript file: $tlnet_install_log" >&2 + echo "$prg: tl-update-tlnet transcript file: $tlnet_install_log" >&2 echo "$prg: install-tl log file: $install_tl_log" >&2 echo "$prg: Copies of both are in /tmp." >&2 echo "$prg: Please rm -rf the trial dir." >&2 @@ -338,10 +339,14 @@ for f in $tlweb/*mactex*; do test ! -r $f || cp -pf $f $tltry done -# mv then rm to avoid the mirmon probe from making the rm fail. +# mv then rm to avoid the mirmon probe failing during the rm. mv $tlweb $tltrybase/tlnet.old mv $tltry $tlweb rm -rf $tltrybase + +# We checked this above also, but check again. +$Master/tlpkg/bin/tlgpg-verify $tlweb/tlpkg/texlive.tlpdb + echo "$0: Done." exit 0 |