From 9d9d15ed644144d5c459c365ddb6749a5a9bd3e4 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Wed, 14 Oct 2020 20:46:13 +0900 Subject: Use wget instead of curl --- ci/android-install-ndk.sh | 2 +- ci/android-install-sdk.sh | 2 +- ci/android-sysimage.sh | 2 +- ci/docker/aarch64-linux-android/Dockerfile | 2 +- ci/docker/arm-linux-androideabi/Dockerfile | 2 +- ci/docker/x86_64-linux-android/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/android-install-ndk.sh b/ci/android-install-ndk.sh index 07d3703959..e37a5542c3 100644 --- a/ci/android-install-ndk.sh +++ b/ci/android-install-ndk.sh @@ -3,7 +3,7 @@ set -ex NDK=android-ndk-r21d -curl --retry 20 -O https://dl.google.com/android/repository/${NDK}-linux-x86_64.zip +wget --tries=20 https://dl.google.com/android/repository/${NDK}-linux-x86_64.zip unzip -q ${NDK}-linux-x86_64.zip case "$1" in diff --git a/ci/android-install-sdk.sh b/ci/android-install-sdk.sh index 8c10c297fb..8858de16d7 100644 --- a/ci/android-install-sdk.sh +++ b/ci/android-install-sdk.sh @@ -11,7 +11,7 @@ set -ex SDK=4333796 mkdir sdk -curl --retry 20 https://dl.google.com/android/repository/sdk-tools-linux-${SDK}.zip -O +wget --tries=20 https://dl.google.com/android/repository/sdk-tools-linux-${SDK}.zip unzip -q -d sdk sdk-tools-linux-${SDK}.zip case "$1" in diff --git a/ci/android-sysimage.sh b/ci/android-sysimage.sh index b0b5e903f2..d6eb32ed68 100644 --- a/ci/android-sysimage.sh +++ b/ci/android-sysimage.sh @@ -14,7 +14,7 @@ main() { apt-get install --no-install-recommends e2tools pushd "${td}" - curl --retry 5 -O "${URL}/${name}" + wget --tries=5 "${URL}/${name}" unzip -q "${name}" local system diff --git a/ci/docker/aarch64-linux-android/Dockerfile b/ci/docker/aarch64-linux-android/Dockerfile index 98da29df01..71a1e6bdec 100644 --- a/ci/docker/aarch64-linux-android/Dockerfile +++ b/ci/docker/aarch64-linux-android/Dockerfile @@ -5,7 +5,7 @@ RUN apt-get update RUN apt-get install -y --no-install-recommends libc6-dev gcc RUN apt-get install -y --no-install-recommends \ file \ - curl \ + wget \ ca-certificates \ python3 \ python3-distutils \ diff --git a/ci/docker/arm-linux-androideabi/Dockerfile b/ci/docker/arm-linux-androideabi/Dockerfile index c88ceebe07..3b200402c5 100644 --- a/ci/docker/arm-linux-androideabi/Dockerfile +++ b/ci/docker/arm-linux-androideabi/Dockerfile @@ -5,7 +5,7 @@ RUN apt-get update RUN apt-get install -y --no-install-recommends libc6-dev gcc RUN apt-get install -y --no-install-recommends \ file \ - curl \ + wget \ ca-certificates \ python3 \ python3-distutils \ diff --git a/ci/docker/x86_64-linux-android/Dockerfile b/ci/docker/x86_64-linux-android/Dockerfile index 87263bce9f..50849e4cab 100644 --- a/ci/docker/x86_64-linux-android/Dockerfile +++ b/ci/docker/x86_64-linux-android/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:20.04 RUN apt-get update && \ apt-get install -y --no-install-recommends \ ca-certificates \ - curl \ + wget \ gcc \ libc-dev \ python3 \ -- cgit v1.2.1