summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLUtils.pm
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2022-02-05 11:02:25 +0000
committerNorbert Preining <preining@logic.at>2022-02-05 11:02:25 +0000
commitaaadd2cee49270e751aac6984a7d32acb7795435 (patch)
tree0de7b0ae7b0d62713a1b08b7c7ae9060ded07272 /Master/tlpkg/TeXLive/TLUtils.pm
parentc44f18d216731903831733bdebfdba0a155de22f (diff)
try to fix curl cacert on some macos
git-svn-id: svn://tug.org/texlive/trunk@61891 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLUtils.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm14
1 files changed, 6 insertions, 8 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index c0a6b26f411..8ba97b12223 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -2625,17 +2625,15 @@ sub setup_programs {
"$bindir/$dltype/$defprog.$platform", "--version", $tlfirst);
}
# check for curl special stuff on MacOS
- if (member("curl", @working_downloaders) && platform() =~ m/^darwin/) {
- #
- my $use_our_cacert = 0;
- # TODO
- # check version of darwin and set $use_our_cacert = 1
- #
- if ($use_our_cacert == 1) {
+ 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', "SOME PATH WE NEED TO DECIDE TODO");
+ unshift (@curlargs, '--cacert', "$::installerdir/tlpkg/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");
}