From 0ba84082e67000b702b838fd78fccaabca347436 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 17 Jun 2008 18:39:42 +0000 Subject: find our own wget binary, if provided git-svn-id: svn://tug.org/texlive/trunk@8817 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLUtils.pm | 22 ++++++++++++---------- Master/tlpkg/installer/wget.exe | Bin 332800 -> 0 bytes Master/tlpkg/installer/wget/wget.exe | Bin 0 -> 332800 bytes 3 files changed, 12 insertions(+), 10 deletions(-) delete mode 100755 Master/tlpkg/installer/wget.exe create mode 100755 Master/tlpkg/installer/wget/wget.exe 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 -- 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 -Sets up the global $::progs hash containing the pathes to the -programs C, C, C. The C<$bindir> argument specifies -the path to the location of the C binaries, the C<$platform> -gives the extension for the C binary. +Populate the global $::progs hash containing the paths to the programs +C, C, C. The C<$bindir> argument specifies the path +to the location of the C 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.exe deleted file mode 100755 index ad974bfe5f8..00000000000 Binary files a/Master/tlpkg/installer/wget.exe and /dev/null differ diff --git a/Master/tlpkg/installer/wget/wget.exe b/Master/tlpkg/installer/wget/wget.exe new file mode 100755 index 00000000000..ad974bfe5f8 Binary files /dev/null and b/Master/tlpkg/installer/wget/wget.exe differ -- cgit v1.2.3