summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive
diff options
context:
space:
mode:
authorReinhard Kotucha <reinhard.kotucha@web.de>2008-04-06 17:56:02 +0000
committerReinhard Kotucha <reinhard.kotucha@web.de>2008-04-06 17:56:02 +0000
commit58f70e8911327a75bd736b0927b9a178e908dc6f (patch)
tree278806e28574b9c9c17ba7e8a7fe54c7c39c6cb1 /Master/tlpkg/TeXLive
parentd243f9098039a404f91996dce8617132b48befa3 (diff)
tlpkg/installer/wgetrc: Read by installer on Windows.
git-svn-id: svn://tug.org/texlive/trunk@7334 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive')
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm9
2 files changed, 7 insertions, 4 deletions
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index 4585c0e6ff7..135e5856104 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -183,7 +183,7 @@ sub from_file {
}
if ($path =~ /^(http|ftp):\/\//) {
tllog($::LOG_DDDEBUG, "TLPDB.pm: trying to initialize from $path\n");
- open(TMP, "wget --timeout=60 --tries=2 -q --output-document=- $path|")
+ open(TMP, "wget -q --output-document=- $path|")
|| die("Cannot open tlpdb file: $path");
} else {
open(TMP,"<$path") || die("Cannot open tlpdb file: $path");
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 5d4044e08ec..d275471a815 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -1,7 +1,7 @@
# $Id$
# The inevitable utilities for TeX Live.
#
-# Copyright 2007 Norbert Preining
+# Copyright 2007 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -680,7 +680,7 @@ sub install_package {
$tarfile =~ s/\.lzma$//;
mkdirhier("$target/temp");
tllog($::LOG_DEBUG, "Downloading $what to $target\\temp\\$fn\n");
- tllog($::LOG_DEBUG, `$wget --tries=2 --timeout=60 -q -O \"$target\\temp\\$fn\" \"$what\" 2>\&1`);
+ tllog($::LOG_DEBUG, `$wget -q -O \"$target\\temp\\$fn\" \"$what\" 2>\&1`);
tllog($::LOG_DEBUG, "Un-lzmaing $target\\temp\\$fn to $target\\temp\\$tarfile\n");
#tllog($::LOG_DEBUG, `type \"$target\\temp\\$fn\" | $lzmadec > \"$target\\temp\\$tarfile\" 2>&1`);
tllog($::LOG_DEBUG, `$lzmadec < \"$target\\temp\\$fn\" > \"$target\\temp\\$tarfile\" 2>&1`);
@@ -689,7 +689,7 @@ sub install_package {
unlink("$target/temp/$tarfile", "$target/temp/$fn");
} else {
tllog($::LOG_DEBUG, "downloading/unlzma-ing/unpacking $what\n");
- tllog($::LOG_NORMAL, `$wget --tries=2 --timeout=60 -q -O- \"$what\"|\"$lzmadec\"|$tar -xf - -C \"$target\"`);
+ tllog($::LOG_NORMAL, `$wget -q -O- \"$what\"|\"$lzmadec\"|$tar -xf - -C \"$target\"`);
}
} elsif ($what =~ m,\.tar.lzma$,) {
if (win32()) {
@@ -817,6 +817,9 @@ again.
sub initialize_installer {
&media;
&platform;
+ if (win32) {
+ $ENV{'WGETRC'}="$::installerdir/plpkg/installer/wgetrc"
+ }
}
=pod