From ecb76c93ebf78bf69cb310ec3d1650e37c0565d6 Mon Sep 17 00:00:00 2001
From: Thomas Hu <tomhu1096@gmail.com>
Date: Thu, 26 Nov 2020 16:05:22 -0500
Subject: [PATCH] Move custom curl args to overwrite defaults

---
 SHA1SUM   | 2 +-
 SHA256SUM | 2 +-
 SHA512SUM | 2 +-
 codecov   | 9 ++++++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/SHA1SUM b/SHA1SUM
index 9abb2de5..a85ca071 100644
--- a/SHA1SUM
+++ b/SHA1SUM
@@ -1 +1 @@
-8e7bfe30232e3538f1f65fe6e4cf553cf9543eb2  codecov
+916545fffc00da332ab6e54313c68148355a934e  codecov
diff --git a/SHA256SUM b/SHA256SUM
index f49fb7c6..42c3ffc3 100644
--- a/SHA256SUM
+++ b/SHA256SUM
@@ -1 +1 @@
-a1494e6093fcf3e743990be5959a8e39251fcdcc9ae7d50000c426482d7b9098  codecov
+6275c83568acd1976f51a275c21aee705d2ac3173e76d2442bfaf0fb54a2ba3d  codecov
diff --git a/SHA512SUM b/SHA512SUM
index 965ccabf..ccd4960f 100644
--- a/SHA512SUM
+++ b/SHA512SUM
@@ -1 +1 @@
-364c912ba02c6da8f67ff0d46e33e309401aab9fc960055bf6ba46335aab6088e12ed5e6eebeb2ae14c4a06aaaf635ad8650e3f6db410f7b447af128ae01f786  codecov
+789970dd08de07fd083e51baf777354bb2a027655c18dddcae94b262f3c28c5a06633f46c5fe32a2416854c59277e6b029c8b6a96a2004347a7aeadd2b35547f  codecov
diff --git a/codecov b/codecov
index cc9983db..156e80d8 100755
--- a/codecov
+++ b/codecov
@@ -1701,12 +1701,13 @@ else
     say "${e}->${x}  Pinging Codecov"
     say "$url/upload/v4?$queryNoToken"
     # shellcheck disable=SC2086,2090
-    res=$(curl $curl_s -X POST $curlargs $cacert \
+    res=$(curl $curl_s -X POST $cacert \
           --retry 5 --retry-delay 2 --connect-timeout 2 \
           -H 'X-Reduced-Redundancy: false' \
           -H 'X-Content-Type: application/x-gzip' \
           -H 'Content-Length: 0' \
           --write-out "\n%{response_code}\n" \
+          $curlargs \
           "$url/upload/v4?$query" || true)
     # a good reply is "https://codecov.io" + "\n" + "https://storage.googleapis.com/codecov/..."
     s3target=$(echo "$res" | sed -n 2p)
@@ -1718,10 +1719,11 @@ else
       say "${s3target}"
 
       # shellcheck disable=SC2086
-      s3=$(curl -fiX PUT $curlawsargs \
+      s3=$(curl -fiX PUT \
           --data-binary @"$upload_file.gz" \
           -H 'Content-Type: application/x-gzip' \
           -H 'Content-Encoding: gzip' \
+          $curlawsargs \
           "$s3target" || true)
 
       if [ "$s3" != "" ];
@@ -1744,13 +1746,14 @@ else
   say "${e}==>${x} Uploading to Codecov"
 
   # shellcheck disable=SC2086,2090
-  res=$(curl -X POST $curlargs $cacert \
+  res=$(curl -X POST $cacert \
         --data-binary @"$upload_file.gz" \
         --retry 5 --retry-delay 2 --connect-timeout 2 \
         -H 'Content-Type: text/plain' \
         -H 'Content-Encoding: gzip' \
         -H 'X-Content-Encoding: gzip' \
         -H 'Accept: text/plain' \
+        $curlargs \
         "$url/upload/v2?$query&attempt=$i" || echo 'HTTP 500')
   # HTTP 200
   # http://....