diff options
Diffstat (limited to 'Master/tlpkg/TeXLive/TLPDB.pm')
-rw-r--r-- | Master/tlpkg/TeXLive/TLPDB.pm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index 7ce95ce83ab..85e52cdc411 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -291,6 +291,7 @@ sub from_file { } $xzfile_quote = "\"$xzfile\""; $tlpdbfile_quote = "\"$tlpdbfile\""; + my $xzdec = "\"$::progs{'xzdec'}\""; debug("trying to download $path.xz to $xzfile\n"); my $ret = TeXLive::TLUtils::download_file("$path.xz", "$xzfile"); # better to check both, the return value AND the existence of the file @@ -300,7 +301,7 @@ sub from_file { # xzdec *hopefully* returns 0 on success and anything else on failure # we don't have to negate since not zero means error in the shell # and thus in perl true - if (system("$::progs{'xzdec'} <$xzfile_quote >$tlpdbfile_quote")) { + if (system("$xzdec <$xzfile_quote >$tlpdbfile_quote")) { debug("un-xzing $xzfile failed, tryin gplain file\n"); # to be sure we unlink the xz file and the tlpdbfile unlink($xzfile); @@ -1292,7 +1293,7 @@ sub _install_package { # we assume that $::progs has been set up! my $wget = $::progs{'wget'}; - my $xzdec = $::progs{'xzdec'}; + my $xzdec = "\"$::progs{'xzdec'}\""; if (!defined($wget) || !defined($xzdec)) { tlwarn("_install_package: programs not set up properly, strange.\n"); return(0); @@ -1334,12 +1335,12 @@ sub _install_package { my $target_quote = $target; if (win32()) { $xzfile =~ s!/!\\!g; - $xzfile_quote = "\"$xzfile\""; $tarfile =~ s!/!\\!g; - $tarfile_quote = "\"$tarfile\""; $target =~ s!/!\\!g; - $target_quote = "\"$target\""; } + $xzfile_quote = "\"$xzfile\""; + $tarfile_quote = "\"$tarfile\""; + $target_quote = "\"$target\""; if ($what =~ m,http://|ftp://,) { # we are installing from the NET # download the file and put it into temp |