use tl-sign-file for signing instead of duplicated gpg invocation

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

4 files changed, 6 insertions, 12 deletions

diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index 635de207af7..774729bf4bf 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -35,7 +35,7 @@ my $opt_relative = 1;
 my $opt_version = 0;
 my $opt_help = 0;
 my $opt_dry = 0;
-my $opt_gpgcmd = "gpg --batch --homedir /home/texlive/.gnupg --passphrase-file /home/texlive/.gnupg/passphrase --armor --detach-sign --local-user 0x06BAB6BC";
+my $opt_gpgcmd = "tl-sign-file";
 
 TeXLive::TLUtils::process_logging_options();
 GetOptions(
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images
index 51260ab4023..56331ec8a82 100755
--- a/Master/tlpkg/bin/tl-update-images
+++ b/Master/tlpkg/bin/tl-update-images
@@ -136,7 +136,7 @@ MAKEINST ()
     (cd $target && md5sum `basename $iso$ext`) >$iso$ext.md5
     (cd $target && sha512sum `basename $iso$ext`) >$iso$ext.sha512
     (cd $target && rm -f $iso$ext.sha512.asc)
-    (cd $target && gpg --batch --homedir /home/texlive/.gnupg --passphrase-file /home/texlive/.gnupg/passphrase --armor --detach-sign --local-user 0x06BAB6BC $iso$ext.sha512)
+    (cd $target && $master/tlpkg/bin/tl-sign-file $iso$ext.sha512)
 
     ln -s `basename $iso$ext` $prefix.iso$ext
     
@@ -147,9 +147,7 @@ MAKEINST ()
     #ln -s `basename $iso`$ext.sha256 $prefix.iso$ext.sha256
 
     rm -f $prefix.iso$ext.sha512.asc
-    gpg --batch --homedir /home/texlive/.gnupg \
-        --passphrase-file /home/texlive/.gnupg/passphrase  \
-        --armor --detach-sign --local-user 0x06BAB6BC $prefix.iso$ext.sha512
+    $master/tlpkg/bin/tl-sign-file $prefix.iso$ext.sha512
     
     ls -l $iso$ext
   done
@@ -192,9 +190,7 @@ do_tar ()
   fi
   (cd $target && sha512sum `basename $tarfile`) >$tarfile.sha512
   (cd $target && rm -f $tarfile.sha512.asc)
-  (cd $target && gpg --batch --homedir /home/texlive/.gnupg \
-       --passphrase-file /home/texlive/.gnupg/passphrase  \
-       --armor --detach-sign --local-user 0x06BAB6BC $tarfile.sha512)
+  (cd $target && $master/tlpkg/bin/tl-sign-file $tarfile.sha512)
 
   ls -l $tarfile
 }
diff --git a/Master/tlpkg/bin/tl-update-install-pkg b/Master/tlpkg/bin/tl-update-install-pkg
index b37397fd32e..41b2a24c8a7 100755
--- a/Master/tlpkg/bin/tl-update-install-pkg
+++ b/Master/tlpkg/bin/tl-update-install-pkg
@@ -38,7 +38,7 @@ use TeXLive::TLConfig;
 $opt_help = 0;
 $opt_verbose = 0;
 $opt_texlivedocs = 0;
-my $opt_gpgcmd = "gpg --batch --homedir /home/texlive/.gnupg --passphrase-file /home/texlive/.gnupg/passphrase --armor --detach-sign --local-user 0x06BAB6BC";
+my $opt_gpgcmd = "tl-sign-file";
 
 sub usage {
   print <<'EOF';
diff --git a/Master/tlpkg/bin/tl-update-tlcritical b/Master/tlpkg/bin/tl-update-tlcritical
index 099fa395b6c..c07cd7c8f55 100755
--- a/Master/tlpkg/bin/tl-update-tlcritical
+++ b/Master/tlpkg/bin/tl-update-tlcritical
@@ -50,9 +50,7 @@ do_updater ()
   # make checksum for new file:
   sha512sum $newfile >$newfile.sha512
   # sign it:
-  gpg --batch --homedir /home/texlive/.gnupg \
-      --passphrase-file /home/texlive/.gnupg/passphrase \
-      --armor --detach-sign --local-user 0x06BAB6BC $newfile.sha512
+  $master/tlpkg/bin/tl-sign-file $newfile.sha512
   #
   # create the generic names as symlinks.  target files must be nonempty.
   test -s $newfile \