From aaadd2cee49270e751aac6984a7d32acb7795435 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 5 Feb 2022 11:02:25 +0000 Subject: try to fix curl cacert on some macos git-svn-id: svn://tug.org/texlive/trunk@61891 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLUtils.pm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'Master/tlpkg/TeXLive/TLUtils.pm') 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"); } -- cgit v1.2.3