summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-02-09 21:47:18 +0000
committerKarl Berry <karl@freefriends.org>2022-02-09 21:47:18 +0000
commit4d5328b5dddc6abc0525adc8d0a637eb9c929288 (patch)
treeb24f4494d6f3f1e3e4a6974168b7165ac1bbc448 /Build
parent39503c4c02c48277c6a9cca57148a3a73aa10aa1 (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@61962 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/tests/TeXLive/TLUtils.pm23
1 files changed, 19 insertions, 4 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index 3de34cafd0a..9bade5c9bb0 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -1,3 +1,4 @@
+# $Id: TLUtils.pm 61960 2022-02-09 21:43:08Z karl $
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
# Copyright 2007-2022 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
@@ -7,7 +8,7 @@ use strict; use warnings;
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 61711 $';
+my $svnrev = '$Revision: 61960 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -2623,6 +2624,20 @@ sub setup_programs {
setup_one(($isWin ? "w32" : "unix"), $defprog,
"$bindir/$dltype/$defprog.$platform", "--version", $tlfirst);
}
+ # check for curl special stuff on MacOS
+ if (member("curl", @working_downloaders) && platform() =~ m/darwin/) {
+ # copied from platform_name
+ chomp (my $sw_vers = `sw_vers -productVersion`);
+ my ($os_major,$os_minor) = split (/\./, $sw_vers);
+ if ($os_major == 10 && ($os_minor == 13 || $os_minor == 14)) {
+ my @curlargs = @{$TeXLive::TLConfig::FallbackDownloaderArgs{'curl'}};
+ # can't push new arg at end of list because builtin list ends with
+ # -o to set the output file.
+ unshift (@curlargs, '--cacert', "$::installerdir/tlpkg/installer/curl/curl-ca-bundle.crt");
+ $TeXLive::TLConfig::FallbackDownloaderArgs{'curl'} = \@curlargs;
+ debug("TLUtils::setup_programs: curl on old darwin, final curl args: @{$TeXLive::TLConfig::FallbackDownloaderArgs{'curl'}}\n");
+ }
+ }
# check for wget/ssl support
if (member("wget", @working_downloaders)) {
debug("TLUtils::setup_programs: checking for ssl enabled wget\n");
@@ -4161,9 +4176,9 @@ sub check_on_working_mirror {
# so try wget and only check for the return value
# please KEEP the / after $mirror, some ftp mirrors do give back
# an error if the / is missing after ../CTAN/
- my $cmd = "$wget $mirror/ --timeout=$NetworkTimeout -O "
- . (win32() ? "nul" : "/dev/null")
- . " 2>" . (win32() ? "nul" : "/dev/null");
+ my $cmd = "$wget $mirror/ --timeout=$NetworkTimeout -O -"
+ . " >" . (TeXLive::TLUtils::nulldev())
+ . " 2>" . (TeXLive::TLUtils::nulldev());
my $ret = system($cmd);
# if return value is not zero it is a failure, so switch the meanings
return ($ret ? 0 : 1);