From b1352c1942a5b63bc37c0a2359b960fcb8dc5037 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 13 Apr 2016 07:10:41 +0000 Subject: fixes for gpg updates git-svn-id: svn://tug.org/texlive/trunk@40485 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/tl-update-install-pkg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Master/tlpkg/bin/tl-update-install-pkg') diff --git a/Master/tlpkg/bin/tl-update-install-pkg b/Master/tlpkg/bin/tl-update-install-pkg index b102c77e732..e5c7427aec2 100755 --- a/Master/tlpkg/bin/tl-update-install-pkg +++ b/Master/tlpkg/bin/tl-update-install-pkg @@ -38,6 +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"; sub usage { print <<'EOF'; @@ -65,6 +66,7 @@ GetOptions( "outputdir|o=s", "texlivedocs|t", "verbose|v", + "gpgcmd=s" => \$opt_gpgcmd, "help|h") or usage(); usage if $opt_help; @@ -238,7 +240,7 @@ sub install_files { copy ("$tmpdir/$f", $outputdir); system ("cd $outputdir && $TeXLive::TLConfig::ChecksumProgram $f >$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 ("cd $outputdir && $opt_gpgcmd $f.$TeXLive::TLConfig::ChecksumExtension"); system ('ls', '-l', "$outputdir/$f"); } @@ -265,7 +267,7 @@ sub install_files { # These tlpkg/ subdirs exist when installing via tl-update-tlnet (?), # though not when testing this script standalone. - xsystem ("cd tlpkg && rm -rf TeXLive installer tlperl translations"); + xsystem ("cd tlpkg && rm -rf TeXLive installer tlperl translations gpg"); xsystem ("mv $junkdir/$install_tl_name/tlpkg/* tlpkg/"); xsystem ("rm -rf $junkdir"); } -- cgit v1.2.3