diff options
| author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2022-10-23 08:34:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2022-10-23 09:48:06 +0000 |
| commit | e7542b50d31941426a156ca871a72bc248e01db5 (patch) | |
| tree | 4be89ff9afd23e757baeed57d61159868a407014 /share/get-scripts/curl | |
| parent | Releasing version 20221015. (diff) | |
| download | compute-tools-e7542b50d31941426a156ca871a72bc248e01db5.tar.xz compute-tools-e7542b50d31941426a156ca871a72bc248e01db5.zip | |
Removing curl pre-http2 option handling.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to 'share/get-scripts/curl')
| -rwxr-xr-x | share/get-scripts/curl | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/share/get-scripts/curl b/share/get-scripts/curl index 2dce4cf..00a8d73 100755 --- a/share/get-scripts/curl +++ b/share/get-scripts/curl @@ -231,13 +231,6 @@ done # FIXME: default server via configuration file -CURL_OPTIONS="" - -if curl -V | grep -qs http2 -then - CURL_OPTIONS="${CURL_OPTIONS} --http2" -fi - if [ -z "${SYSTEM}" ] then # Downloading container list @@ -259,7 +252,7 @@ then GREP_PATTERN="${GREP_PATTERN:-${ARCHITECTURE}}" echo "Downloading $(echo ${SERVER} | awk -F/ '{ print $3 }') container list" - curl --fail --location --progress-bar --user-agent ${SOFTWARE}/${VERSION} ${CURL_OPTIONS} \ + curl --fail --location --progress-bar --user-agent ${SOFTWARE}/${VERSION} --http2 \ "${SERVER}/container-list.txt" | grep -E "${GREP_PATTERN}" > "${DEBCONF_TMPDIR}/container-list.txt" umask 0022 @@ -320,7 +313,7 @@ do fi echo "Downloading ${FILE}" - curl --fail --location --progress-bar --user-agent ${SOFTWARE}/${VERSION} ${CURL_OPTIONS} ${CURL_TIME_COND} \ + curl --fail --location --progress-bar --user-agent ${SOFTWARE}/${VERSION} --http2 ${CURL_TIME_COND} \ "${SERVER}/${FILE}" -o "${CACHE}/${FILE}" fi done |