summaryrefslogtreecommitdiff
path: root/systems/texlive/tlnet/tlpkg/TeXLive
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-02-07 03:03:44 +0000
committerNorbert Preining <norbert@preining.info>2022-02-07 03:03:44 +0000
commitf689c91581665257602a841d03f73078c3495e14 (patch)
tree09c55c606b43f4f53c4c8f9e09625813e19fb2b0 /systems/texlive/tlnet/tlpkg/TeXLive
parent350b3e35109171f0edd6fe9d697b91d5e76561f9 (diff)
CTAN sync 202202070303
Diffstat (limited to 'systems/texlive/tlnet/tlpkg/TeXLive')
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm18
1 files changed, 16 insertions, 2 deletions
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
index 6651b354f6..156d0b2b48 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
@@ -1,4 +1,4 @@
-# $Id: TLUtils.pm 61711 2022-01-23 16:29:03Z karl $
+# $Id: TLUtils.pm 61892 2022-02-05 11:02:32Z preining $
# 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
@@ -8,7 +8,7 @@ use strict; use warnings;
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 61711 $';
+my $svnrev = '$Revision: 61892 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -2624,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");