use TeXLive::TLCrypto; doc

git-svn-id: svn://tug.org/texlive/trunk@40653 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 11 insertions, 9 deletions

diff --git a/Master/tlpkg/bin/check-tlnet-consistency b/Master/tlpkg/bin/check-tlnet-consistency
index 5e83a991daf..b8f28b36b65 100755
--- a/Master/tlpkg/bin/check-tlnet-consistency
+++ b/Master/tlpkg/bin/check-tlnet-consistency
@@ -15,6 +15,7 @@ BEGIN {
 
 use strict;
 use TeXLive::TLConfig;
+use TeXLive::TLCrypto;
 use TeXLive::TLPOBJ;
 use TeXLive::TLPDB;
 use TeXLive::TLUtils;
@@ -234,7 +235,7 @@ sub check_size_checksum {
     my $s = (stat $cont)[7];
     if ($s == $size) {
       if ($checksum) {
-        if (TeXLive::TLUtils::tlchecksum($cont) ne $checksum) {
+        if (TeXLive::TLCrypto::tlchecksum($cont) ne $checksum) {
           $checksumerror = 1;
         }
       }
diff --git a/Master/tlpkg/bin/tl-fix-container-infos b/Master/tlpkg/bin/tl-fix-container-infos
index cd2e03778fb..f5c80de6915 100755
--- a/Master/tlpkg/bin/tl-fix-container-infos
+++ b/Master/tlpkg/bin/tl-fix-container-infos
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright 2008, 2009 Norbert Preining
+# Copyright 2008-2016 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 # 
@@ -14,6 +14,7 @@ BEGIN {
 
 use strict;
 use TeXLive::TLConfig;
+use TeXLive::TLCrypto;
 use TeXLive::TLPOBJ;
 use TeXLive::TLPDB;
 use TeXLive::TLUtils;
@@ -120,7 +121,7 @@ sub do_containers {
 sub do_size_md {
   my $f = shift;
   my $size = (stat $f)[7];
-  my $md = TeXLive::TLUtils::tlmd5($f);
+  my $md = TeXLive::TLCrypto::tlmd5($f);
   return($size, $md);
 }
 
@@ -166,7 +167,6 @@ The format of the containers and the splitting of source and
 documentation files are controlled by the TLPDB options in the
 pseudo-package C<00texlive.config>.  See L<TeXLive::TLPDB>.
 
-
 =head1 DESCRIPTION
 
 This program adds (or updates) {,src,doc}container{size,md5} entries for
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images
index e29d7bf6189..f0f854ef7d8 100755
--- a/Master/tlpkg/bin/tl-update-images
+++ b/Master/tlpkg/bin/tl-update-images
@@ -74,10 +74,10 @@ MAKEINST ()
   origdir=`pwd`
   prefix=$target/$NAME$V # directory and prefix for our files within
   iso=$prefix-$D.iso
-  echo; echo "-- `date` writing image to $iso"
+  echo "-- `date` writing iso to $iso"
 
-  # remove old images and checksums.
-  rm -f $prefix-*.iso* $prefix-*.md5 $prefix-*.sha256 $prefix-*.sha512
+  # remove old images, checksums, signatures, versioned and generic.
+  rm -f $iso* $prefix.iso*
 
   # the image consists of the tlnet tree and the top-level files
   # from master, more or less.
@@ -116,7 +116,7 @@ MAKEINST ()
   # some files we don't want in the image after all.
   rm -rf $imgdir/doc.html $imgdir/tlpkg/texlive.tlpdb.xz $imgdir/tlpkg/bin
 
-  # the actual iso build.
+  # the actual iso creation.
   cd $imgdir || exit 1
   cmd="$mkisofs $common_mkisofs_options -o $iso ."
   echo "-- `date` with: $cmd"
@@ -130,7 +130,7 @@ MAKEINST ()
   cd $target || exit 1
   rm -rf $imgdir
 
-  # make checksums
+  # make checksums; 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
 
@@ -200,6 +200,7 @@ do_tar ()
   #
   cd $origdir || exit 1
 
+  echo
   ls -l $tarfile $tarfile.sha512 $tarfile.sha512.asc
 }