diff options
-rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 22 | ||||
-rwxr-xr-x | Master/tlpkg/installer/wget/wget.exe (renamed from Master/tlpkg/installer/wget.exe) | bin | 332800 -> 332800 bytes |
2 files changed, 12 insertions, 10 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index ce8ffe8412c..f766f812109 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -40,8 +40,8 @@ C<TeXLive::TLUtils> -- utilities used in the TeX Live infrastructure TeXLive::TLUtils::dir_writable($path); TeXLive::TLUtils::mkdirhier($path); TeXLive::TLUtils::copy($file, $target_dir); - TeXLive::TLUtils::download_file( $path, $destination [, $progs ] ); - TeXLive::TLUtils::setup_programs( $bindir, $platform); + TeXLive::TLUtils::download_file($path, $destination [, $progs ]); + TeXLive::TLUtils::setup_programs($bindir, $platform); =head2 Installer Functions @@ -755,10 +755,10 @@ sub install_package { =item C<setup_programs( $bindir, $platform )> -Sets up the global $::progs hash containing the pathes to the -programs C<wget>, C<tar>, C<lzmadec>. The C<$bindir> argument specifies -the path to the location of the C<lzmadec> binaries, the C<$platform> -gives the extension for the C<lzmadec> binary. +Populate the global $::progs hash containing the paths to the programs +C<wget>, C<tar>, C<lzmadec>. The C<$bindir> argument specifies the path +to the location of the C<lzmadec> binaries, the C<$platform> gives the +TeX Live platform name, used as the extension on the executables. =cut @@ -776,13 +776,15 @@ sub setup_programs { $::progs{'lzmadec'} = "$bindir/lzma/lzmadec.$platform"; $::progs{'lzma'} = "$bindir/lzma/lzma.$platform"; $::progs{'tar'} = "tar"; - if ($^O=~/^MSWin(32|64)$/i) { - $::progs{'wget'} = conv_to_win_path("$bindir/wget.exe"); + + if ($^O =~ /^MSWin(32|64)$/i) { + $::progs{'wget'} = conv_to_win_path("$bindir/wget/wget.exe"); $::progs{'tar'} = conv_to_win_path("$bindir/tar.exe"); $::progs{'lzmadec'} = conv_to_win_path("$bindir/lzma/lzmadec.win32.exe"); $::progs{'lzma'} = conv_to_win_path("$bindir/lzma/lzma.exe"); - } elsif ( $^O =~ /^darwin$/i ) { - $::progs{'wget'} = "$bindir/wget"; + + } elsif (-r "$bindir/wget/wget.$platform") { + $::progs{'wget'} = "$bindir/wget/wget.$platform"; } } diff --git a/Master/tlpkg/installer/wget.exe b/Master/tlpkg/installer/wget/wget.exe Binary files differindex ad974bfe5f8..ad974bfe5f8 100755 --- a/Master/tlpkg/installer/wget.exe +++ b/Master/tlpkg/installer/wget/wget.exe |