more checks that signing/checksumming was successful for the nightly build

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

5 files changed, 13 insertions, 15 deletions

diff --git a/Master/tlpkg/bin/tl-sign-file b/Master/tlpkg/bin/tl-sign-file
index b831bd86d77..674e5e5db93 100755
--- a/Master/tlpkg/bin/tl-sign-file
+++ b/Master/tlpkg/bin/tl-sign-file
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $Id$
 # Public domain.  Originally written 2016, Norbert Preining
-# Sign a file for release in TeX Live
+# Sign a file for release in TeX Live.
 
 if test $# -ne 1; then
   echo "$0: Exactly one argument must be given, the file to sign." >&2
@@ -12,13 +12,13 @@ fi
 rm -f "$1.asc"
 
 prg=gpg
-if ! [ "x$TL_GNUPG" = "x" ] ; then
+if test "x$TL_GNUPG" != "x" ; then
   # use the environment variable TL_GNUPG
   prg=$TL_GNUPG
 fi
 
 # sign
-$prg --batch \
+"$prg" --batch \
     --homedir /home/texlive/.gnupg \
     --passphrase-file /home/texlive/.gnupg/passphrase \
     --armor \
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index 42f39eeac66..a1b0c36421f 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright 2008-2016 Norbert Preining
+# Copyright 2008-2018 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 # 
@@ -76,8 +76,8 @@ sub main {
   my @packs = $tlpdb->expand_dependencies("-only-arch", $tlpdb,
                                         @ARGV ? @ARGV : $tlpdb->list_packages);
 
-  # if no argument is passed in, we use tl-sign-file from script_master
-  if (!$opt_gpgcmd) {
+  # if no argument passed, we use tl-sign-file from script_master
+  if (! $opt_gpgcmd) {
     $opt_gpgcmd = "$script_master/tlpkg/bin/tl-sign-file";
   }
 
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images
index 33046a1eaf8..4bb72acea56 100755
--- a/Master/tlpkg/bin/tl-update-images
+++ b/Master/tlpkg/bin/tl-update-images
@@ -229,10 +229,10 @@ do_tar ()
   cd $target || exit 1
   #
   rm -f $tarfile.sha512
-  sha512sum `basename $tarfile` >$tarfile.sha512
+  sha512sum `basename $tarfile` >$tarfile.sha512 || exit 1
   #
   rm -f $tarfile.sha512.asc
-  $master/tlpkg/bin/tl-sign-file $tarfile.sha512
+  $master/tlpkg/bin/tl-sign-file $tarfile.sha512 || exit 1
   #
   cd $origdir || exit 1
 
diff --git a/Master/tlpkg/bin/tl-update-install-pkg b/Master/tlpkg/bin/tl-update-install-pkg
index 0591a383dad..9628f944854 100755
--- a/Master/tlpkg/bin/tl-update-install-pkg
+++ b/Master/tlpkg/bin/tl-update-install-pkg
@@ -1,7 +1,6 @@
 #!/usr/bin/env perl
 # $Id$
-#
-# Copyright 2008-2016 Reinhard Kotucha, Norbert Preining, Karl Berry
+# Copyright 2008-2018 Reinhard Kotucha, Norbert Preining, Karl Berry
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
@@ -239,10 +238,9 @@ sub install_files {
   for my $f ("install-tl-unx.tar.gz", "install-tl.zip",
              "install-tl-windows.exe") {
     copy ("$tmpdir/$f", $outputdir);
-    system ("cd $outputdir && $TeXLive::TLConfig::ChecksumProgram $f >$f.$TeXLive::TLConfig::ChecksumExtension");
-    # keep that on one line!
-    system ("cd $outputdir && rm -f $f.$TeXLive::TLConfig::ChecksumExtension.asc");
-    system ("cd $outputdir && $opt_gpgcmd $f.$TeXLive::TLConfig::ChecksumExtension");
+    xsystem ("cd $outputdir && $TeXLive::TLConfig::ChecksumProgram $f >$f.$TeXLive::TLConfig::ChecksumExtension");
+    xsystem ("cd $outputdir && rm -f $f.$TeXLive::TLConfig::ChecksumExtension.asc");
+    xsystem ("cd $outputdir && $opt_gpgcmd $f.$TeXLive::TLConfig::ChecksumExtension");
     system ('ls', '-l', "$outputdir/$f");
   }
 
diff --git a/Master/tlpkg/bin/tl-update-tlcritical b/Master/tlpkg/bin/tl-update-tlcritical
index b600bee6ccc..f8f8f472527 100755
--- a/Master/tlpkg/bin/tl-update-tlcritical
+++ b/Master/tlpkg/bin/tl-update-tlcritical
@@ -51,7 +51,7 @@ do_updater ()
   # make checksum for new file:
   sha512sum $newfile >$newfile.sha512
   # sign it:
-  $master/tlpkg/bin/tl-sign-file $newfile.sha512
+  $master/tlpkg/bin/tl-sign-file $newfile.sha512 || exit 1
   #
   # create the generic names as symlinks.  target files must be nonempty.
   test -s $newfile \