summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-24 22:38:54 +0000
committerKarl Berry <karl@freefriends.org>2016-05-24 22:38:54 +0000
commite20b462a4939c1404734dfdbd5ec09b035bd4414 (patch)
tree1dd72eecd6a20271556b70eacc265f80f6286e96
parent371421ec0837123b676336b7c501b9235135c008 (diff)
tl-update-images: remake checksums after tl-prune-platforms;
tl-update-tlnet: regex for fmtutil failure git-svn-id: svn://tug.org/texlive/trunk@41285 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/tlpkg/bin/tl-update-images42
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlnet2
2 files changed, 31 insertions, 13 deletions
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images
index 5266054eac7..d3c018b691e 100755
--- a/Master/tlpkg/bin/tl-update-images
+++ b/Master/tlpkg/bin/tl-update-images
@@ -113,18 +113,17 @@ MAKEINST ()
cp $mydir/tl-prune-platforms $imgdir/tlpkg/bin
$imgdir/tlpkg/bin/tl-prune-platforms $prune >/tmp/imgprune
+ # due to the pruning, must re-checksum and re-sign the tlpdb in the image.
+ md5sum $imgdir/tlpkg/texlive.tlpdb >$imgdir/tlpkg/texlive.tlpdb.md5 \
+ || exit 1
+ sha512sum $imgdir/tlpkg/texlive.tlpdb >$imgdir/tlpkg/texlive.tlpdb.sha512 \
+ || exit 1
+ $master/tlpkg/bin/tl-sign-file $imgdir/tlpkg/texlive.tlpdb.sha512 \
+ || exit 1
+
# some files we don't want in the image after all.
rm -rf $imgdir/doc.html $imgdir/tlpkg/texlive.tlpdb.xz $imgdir/tlpkg/bin
- # since prune-platforms changes the tlpdb file, must remake checksums.
- # (before making the iso). redundantly remove files being created.
- rm -f $prefix.iso.md5; md5sum `basename $iso` >$iso.md5
- rm -f $prefix.iso.sha512; sha512sum `basename $iso` >$iso.sha512
-
- # for md5 and sha512, adjust the embedded filename for generic files.
- rm -f $prefix.iso.md5; sed "s,-$D,," $iso.md5 >$prefix.iso.md5
- rm -f $prefix.iso.sha512; sed "s,-$D,," $iso.sha512 >$prefix.iso.sha512
-
# the actual iso creation.
cd $imgdir || exit 1
cmd="$mkisofs $common_mkisofs_options -o $iso ."
@@ -139,17 +138,36 @@ MAKEINST ()
cd $target || exit 1
rm -rf $imgdir
- # signed versioned and generic files.
+ # since prune-platforms changes the tlpdb file, must remake checksums.
+ # (before making the iso). redundantly remove files being created.
+ rm -f $prefix.iso.md5; md5sum `basename $iso` >$iso.md5 || exit 1
+ rm -f $prefix.iso.sha512; sha512sum `basename $iso` >$iso.sha512 || exit 1
+
+ # for md5 and sha512, adjust the embedded filename for generic files.
+ rm -f $prefix.iso.md5; sed "s,-$D,," $iso.md5 >$prefix.iso.md5
+ rm -f $prefix.iso.sha512; sed "s,-$D,," $iso.sha512 >$prefix.iso.sha512
+
+ # sign both the versioned and generic checksums, separately.
rm -f $iso.sha512.asc
- $master/tlpkg/bin/tl-sign-file $iso.sha512
+ $master/tlpkg/bin/tl-sign-file $iso.sha512 || exit 1
#
rm -f $prefix.iso.sha512.asc
- $master/tlpkg/bin/tl-sign-file $prefix.iso.sha512
+ $master/tlpkg/bin/tl-sign-file $prefix.iso.sha512 || exit 1
# symlinks with short name (potentially used in /etc/fstab).
ln -s `basename $iso` $prefix.iso # with year
ln -s `basename $iso` $target/$NAME.iso # no year
+ # at the end, all the files should be non-empty.
+ all_ok=true
+ for f in *.md5 *.sha512 *.asc *.iso; do
+ if test ! -s $f; then
+ echo "$0: MAKEINST: unexpected empty file: $f" >&2
+ all_ok=false
+ fi
+ done
+ $all_ok || exit 1 # give up now if empty files
+
cd $origdir || exit 1
echo "-- `date` iso files:"
ls -l $iso $iso.sha512 $iso.sha512.asc
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index 520fd47dada..a7d05b73540 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -219,7 +219,7 @@ fi
# Format creation check, in case fmtutil's exit status wasn't right.
install_tl_log=$tltryinst/$yyyy/install-tl.log
-if grep -i '^fmtutil.*: error' $install_tl_log >/dev/null; then
+if grep -i '^fmtutil.*error.*: $install_tl_log >/dev/null; then
echo >&2
echo "$0: seems fmtutil failed, check $install_tl_log." >&2
failure=true