summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLUtils.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2016-04-21 13:27:49 +0000
committerNorbert Preining <preining@logic.at>2016-04-21 13:27:49 +0000
commitb9dcc4923116100300b073399a050683303a1610 (patch)
tree2a5bdf718b1ccc559e36edfbbffa67ee96bfec2e /Master/tlpkg/TeXLive/TLUtils.pm
parent6dab3ac1765024cf6740b90e61e90a7698869504 (diff)
setup_gpg: fix double quotation on loosedows
git-svn-id: svn://tug.org/texlive/trunk@40650 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLUtils.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm10
1 files changed, 8 insertions, 2 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index d5955f1d069..2a6c4192395 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -3706,13 +3706,19 @@ sub setup_gpg {
($^O =~ /^MSWin/i ? "exe" : platform()) ;
debug("Testing for gpg in $p\n");
if (-r $p) {
- $prg = $p;
+ if ($^O =~ /^MSWin/i) {
+ $prg = conv_to_w32_path($p);
+ } else {
+ $prg = "\"$p\"";
+ }
$found = 1;
}
}
}
return 0 if (!$found);
+ # $prg is already properly quoted!
+
# ok, we found one
# Set up the gpg invocation:
my $gpghome = ($ENV{'TL_GNUPGHOME'} ? $ENV{'TL_GNUPGHOME'} :
@@ -3720,7 +3726,7 @@ sub setup_gpg {
$gpghome =~ s!/!\\!g if win32();
my $gpghome_quote = "\"$gpghome\"";
# mind the final space for following args
- $::gpg = "\"$prg\" --homedir $gpghome_quote ";
+ $::gpg = "$prg --homedir $gpghome_quote ";
if ($ENV{'TL_GNUPGARGS'}) {
$::gpg .= $ENV{'TL_GNUPGARGS'};
} else {