summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2016-04-21 03:04:00 +0000
committerNorbert Preining <preining@logic.at>2016-04-21 03:04:00 +0000
commit3e4a0a47addf2f3f56f3a0929dff5cc734dadfaa (patch)
tree67722443954649995c12345b5955e56ab9f40ccd /Master
parent800560e3139b1d2c41bc86a3fbf8659529ee39d8 (diff)
setup_gpg: search for tlgpg for all archs
git-svn-id: svn://tug.org/texlive/trunk@40647 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm11
1 files changed, 7 insertions, 4 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 9eb2c89be25..d5955f1d069 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -3700,10 +3700,13 @@ sub setup_gpg {
$prg = test_one_gpg('gpg2');
$found = 1 if ($prg);
}
- if (!$found && $^O =~ /^MSWin/i) {
- # test on windows also a shipped version from texlive.gpg.win32
- if (-r "$master/tlpkg/installer/gpg/gpg.exe") {
- $prg = "$master/tlpkg/installer/gpg/gpg.exe";
+ if (!$found) {
+ # test also a shipped version from tlgpg
+ my $p = "$master/tlpkg/installer/gpg/gpg." .
+ ($^O =~ /^MSWin/i ? "exe" : platform()) ;
+ debug("Testing for gpg in $p\n");
+ if (-r $p) {
+ $prg = $p;
$found = 1;
}
}