diff options
Diffstat (limited to 'Master/tlpkg/TeXLive/TLUtils.pm')
| -rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index b28af9421e3..fd6e53eb35f 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -482,16 +482,17 @@ sub install_package { my $platform=&platform; my $buffer; my $offset; + # shouldn't it be 4096 my $blocksize=2048; + #my $lzmadec="$bindir/lzmadec_$platform"; + my $lzmadec="lzcat"; + my $tar="/bin/tar -xf - -C"; + my $wget="wget -nv -O-"; if (win32) { - my $lzmadec="$bindir/lzma.exe -si -so"; - my $tar="$bindir/tar.exe -xf - -C"; - my $wget="$bindir/wget.exe -nv -O-"; - } else { - my $lzmadec="$bindir/lzmadec_$platform"; - my $tar="/bin/tar -xf - -C"; - my $wget="wget -nv -O-"; + $lzmadec="$bindir/lzma.exe -si -so"; + $tar="$bindir/tar.exe -xf - -C"; + $wget="$bindir/wget.exe -nv -O-"; } if (&media eq 'DVD') { @@ -503,7 +504,8 @@ sub install_package { } elsif (&media eq 'CD') { my $package="$::installerdir/archive/$what[0]"; sysopen IN, "$package", O_RDONLY - or die "Can't open '$infile': $!\n"; + or warn "Can't open '$infile': $!\n"; + #or die "Can't open '$infile': $!\n"; binmode IN; open OUT, "|$lzmadec|$tar $target"; @@ -600,7 +602,7 @@ sub architectures_available { @dir=readdir DIR; chomp @dir; for (@dir) { - if (/bin-kpathsea.(.*).zip$/) { + if ((/bin-kpathsea.(.*).zip$/) || (/bin-kpathsea.(.*).tar.lzma$/)) { push @platforms, $1; } } |