diff options
| author | Karl Berry <karl@freefriends.org> | 2018-09-21 22:18:21 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2018-09-21 22:18:21 +0000 |
| commit | d89bfac335e0b4ee5e068158dbe01876ed05532b (patch) | |
| tree | a8e8c2a01bc2ce396d9e09c51470e976070b8682 /Master/tlpkg/TeXLive | |
| parent | b5a895685f9b6f91853bcf9dc9eb368376409894 (diff) | |
doc,formatted
git-svn-id: svn://tug.org/texlive/trunk@48727 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive')
| -rw-r--r-- | Master/tlpkg/TeXLive/TLConfig.pm | 9 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLPSRC.pm | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm index afdbdc2082c..c700cf742c6 100644 --- a/Master/tlpkg/TeXLive/TLConfig.pm +++ b/Master/tlpkg/TeXLive/TLConfig.pm @@ -114,7 +114,8 @@ if ($^O =~ /^MSWin/i) { our @AcceptedFallbackDownloaders = qw/curl wget/; our %FallbackDownloaderProgram = ( 'wget' => 'wget', 'curl' => 'curl'); our %FallbackDownloaderArgs = ( - 'curl' => ['--user-agent', 'texlive/curl', '--retry', '10', '--fail', '--location', + 'curl' => ['--user-agent', 'texlive/curl', '--retry', '10', + '--fail', '--location', '--connect-timeout', "$NetworkTimeout", '--silent', '--output'], 'wget' => ['--user-agent=texlive/wget', '--tries=10', "--timeout=$NetworkTimeout", '-q', '-O'], @@ -143,7 +144,9 @@ our %Compressors = ( "priority" => 30, }, ); -our $CompressorExtRegexp = "(" . join("|", map { $Compressors{$_}{'extension'} } keys(%Compressors)) . ")"; +our $CompressorExtRegexp = "(" + . join("|", map { $Compressors{$_}{'extension'} } keys %Compressors) + . ")"; # archive (not user) settings. # these can be overridden by putting them into 00texlive.config.tlpsrc @@ -223,7 +226,7 @@ our %TLPDBOptions = ( our %TLPDBSettings = ( "platform" => [ "s", "Main platform for this computer" ], - "available_architectures" => [ "l", "All available/installed architectures" ], + "available_architectures" => [ "l","All available/installed architectures" ], "usertree" => [ "b", "This tree acts as user tree" ] ); diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm index 218a7baf279..66638b76739 100644 --- a/Master/tlpkg/TeXLive/TLPSRC.pm +++ b/Master/tlpkg/TeXLive/TLPSRC.pm @@ -145,7 +145,7 @@ sub from_file { } elsif ($line =~ /^shortdesc\s*(.*)$/) { # although we would like to do this, hyphen-latin.tlpsrc contains - # multiple short/longdesc entries. Not worth following up. + # multiple short/longdesc, entries. Not worth following up. # $shortdesc # && die "$srcfile:$lineno: second shortdesc not allowed: $line" # . "(have $shortdesc)\n"; @@ -795,7 +795,7 @@ Catalogue. =item C<shortdesc> gives a one line description of the package. Subsequent entries will -overwrite the former ones. In TeX Live only used for collections and +overwrite the former ones. In TeX Live primarily used for collections and schemes. =item C<longdesc> |