diff options
| -rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 11 |
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; } } |