summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2016-04-16 12:21:02 +0000
committerNorbert Preining <preining@logic.at>2016-04-16 12:21:02 +0000
commitc0c56fc7056452f6dded55b05c7425f3e3475a28 (patch)
treef86a86a3205cbb19d4d361fe5716f8e04947d34a /Master
parent6925ed72574cb1d92b4237fa51d3299098d61c36 (diff)
try to support spaces in path on Windows
git-svn-id: svn://tug.org/texlive/trunk@40551 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index bf4a819cccc..bd9f50108b5 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -3649,7 +3649,13 @@ sub test_one_gpg {
my $cmdline;
debug("Testing for gpg in $prg\n");
if ($^O =~ /^MSWin(32|64)$/i) {
- $prg = conv_to_w32_path($prg) if ($^O =~ /^MSWin(32|64)$/i);
+ # Perl on Windows somehow does not allow calling a program
+ # without a full path - at least a call to "gpg" tells me
+ # that "c:/Users/norbert/gpg" is not recognized ...
+ # consequence - use which!
+ $prg = which($prg);
+ return "" if (!$prg);
+ $prg = conv_to_w32_path($prg);
$cmdline = "$prg --version >nul 2>&1";
} else {
$cmdline = "$prg --version >/dev/null 2>&1";