summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2016-04-13 03:20:29 +0000
committerNorbert Preining <preining@logic.at>2016-04-13 03:20:29 +0000
commit6fdb8d562de4acfc326b7177140be98467912a7e (patch)
treeb9bf46b9fb35c8f632eb012c6cc8af8ba5847458
parent44c070f1e7bb91225c7924c8f55bc23700678d19 (diff)
fixes for the errors found in the first cron run
git-svn-id: svn://tug.org/texlive/trunk@40484 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/tlpkg/bin/tl-update-containers2
-rwxr-xr-xMaster/tlpkg/bin/tl-update-images4
-rwxr-xr-xMaster/tlpkg/bin/tl-update-install-pkg5
3 files changed, 4 insertions, 7 deletions
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index 68eef30b952..6a737dd0a62 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -388,7 +388,7 @@ sub main
xsystem("$TeXLive::TLConfig::ChecksumProgram texlive.tlpdb > texlive.tlpdb.$TeXLive::TLConfig::ChecksumExtension");
# the following somehow needs to be on one line, otherwise the shell
# expansion is strange!
- xsystem("gpg --homedir /home/texlive/.gnupg --passphrase-file /home/texlive/.gnupg/passphrase --armor --detach-sign --local-user 0x06BAB6BC texlive.tlpdb.$TeXLive::TLConfig::ChecksumExtension");
+ xsystem("gpg --batch --homedir /home/texlive/.gnupg --passphrase-file /home/texlive/.gnupg/passphrase --armor --detach-sign --local-user 0x06BAB6BC texlive.tlpdb.$TeXLive::TLConfig::ChecksumExtension");
xchdir($olddir);
} else {
tlwarn("chdir($opt_location/tlpkg/) for md5/checksum creation failed\n: $?");
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images
index 46e18d03271..5949887998f 100755
--- a/Master/tlpkg/bin/tl-update-images
+++ b/Master/tlpkg/bin/tl-update-images
@@ -135,9 +135,7 @@ MAKEINST ()
(cd $target && md5sum `basename $iso$ext`) >$iso$ext.md5
(cd $target && sha512sum `basename $iso$ext`) >$iso$ext.sha512
- (cd $target && gpg --homedir /home/texlive/.gnupg \
- --passphrase-file /home/texlive/.gnupg/passphrase \
- --armor --detach-sign --local-user 0x06BAB6BC $iso$ext.sha512)
+ (cd $target && gpg --batch --homedir /home/texlive/.gnupg --passphrase-file /home/texlive/.gnupg/passphrase --armor --detach-sign --local-user 0x06BAB6BC $iso$ext.sha512)
ln -s `basename $iso$ext` $prefix.iso$ext
diff --git a/Master/tlpkg/bin/tl-update-install-pkg b/Master/tlpkg/bin/tl-update-install-pkg
index 2bf895429f5..b102c77e732 100755
--- a/Master/tlpkg/bin/tl-update-install-pkg
+++ b/Master/tlpkg/bin/tl-update-install-pkg
@@ -237,9 +237,8 @@ sub install_files {
"install-tl-windows.exe") {
copy ("$tmpdir/$f", $outputdir);
system ("cd $outputdir && $TeXLive::TLConfig::ChecksumProgram $f >$f.$TeXLive::TLConfig::ChecksumExtension");
- system ("cd $outputdur && gpg --homedir /home/texlive/.gnupg \
- --passphrase-file /home/texlive/.gnupg/passphrase \
- --armor --detach-sign --local-user 0x06BAB6BC $f.$TeXLive::TLConfig::ChecksumExtension");
+ # keep that on one line!
+ system ("cd $outputdir && gpg --batch --homedir /home/texlive/.gnupg --passphrase-file /home/texlive/.gnupg/passphrase --armor --detach-sign --local-user 0x06BAB6BC $f.$TeXLive::TLConfig::ChecksumExtension");
system ('ls', '-l', "$outputdir/$f");
}