summaryrefslogtreecommitdiff
path: root/Master/tlpkg/bin/tl-update-containers
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2016-04-13 07:10:41 +0000
committerNorbert Preining <preining@logic.at>2016-04-13 07:10:41 +0000
commitb1352c1942a5b63bc37c0a2359b960fcb8dc5037 (patch)
tree6d0afa00df5a90a612a81da69e4115c3dcda7d7b /Master/tlpkg/bin/tl-update-containers
parent6fdb8d562de4acfc326b7177140be98467912a7e (diff)
fixes for gpg updates
git-svn-id: svn://tug.org/texlive/trunk@40485 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/bin/tl-update-containers')
-rwxr-xr-xMaster/tlpkg/bin/tl-update-containers6
1 files changed, 4 insertions, 2 deletions
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index 6a737dd0a62..9b437e3c595 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, 2009, 2010, 2011 Norbert Preining
+# Copyright 2008-2016 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -35,6 +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";
TeXLive::TLUtils::process_logging_options();
GetOptions(
@@ -45,6 +46,7 @@ GetOptions(
"recreate" => \$opt_recreate,
"relative!" => \$opt_relative,
"version" => \$opt_version,
+ "gpgcmd=s" => \$opt_gpgcmd,
"help|?" => \$opt_help) or pod2usage(1);
pod2usage("-exitstatus" => 0, "-verbose" => 2) if $opt_help;
@@ -388,7 +390,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 --batch --homedir /home/texlive/.gnupg --passphrase-file /home/texlive/.gnupg/passphrase --armor --detach-sign --local-user 0x06BAB6BC texlive.tlpdb.$TeXLive::TLConfig::ChecksumExtension");
+ xsystem("$opt_gpgcmd texlive.tlpdb.$TeXLive::TLConfig::ChecksumExtension");
xchdir($olddir);
} else {
tlwarn("chdir($opt_location/tlpkg/) for md5/checksum creation failed\n: $?");