From 68d10557f185fb83fe8297b7d73d93db72545bc2 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Fri, 23 Jun 2017 21:16:16 +0200
Subject: travis: fetch static apk-tools from GitHub instead of aports

---
 .travis/install-alpine | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.travis/install-alpine b/.travis/install-alpine
index b4607f8a09..61094159a6 100755
--- a/.travis/install-alpine
+++ b/.travis/install-alpine
@@ -4,16 +4,17 @@ set -eu
 
 . "$(dirname "$0")"/common.sh
 
-APK_TOOLS_URI='http://nl.alpinelinux.org/alpine/v3.5/main/x86_64/apk-tools-static-2.6.8-r2.apk'
-APK_TOOLS_SHA256='e163b7d67e81946d67abb8bb1da3449792b52ad872d3b59967f90d445b50784f'
+APK_TOOLS_URI='https://github.com/alpinelinux/apk-tools/releases/download/v2.7.2/apk-tools-2.7.2-x86_64-linux.tar.gz'
+APK_TOOLS_SHA256='e949d3826d08ad41622b29186f960b135711dd96aacfb80ff8238c0fd69d051f'
 
 
-title 'Downloading apk-tools-static'
+title 'Downloading static apk-tools'
 
 cd /tmp
-wget "$APK_TOOLS_URI"
-echo "$APK_TOOLS_SHA256  $(basename "$APK_TOOLS_URI")" | sha256sum -c
-tar -xzf $(basename "$APK_TOOLS_URI")
+wget -T 10 "$APK_TOOLS_URI"
+echo "$APK_TOOLS_SHA256  ${APK_TOOLS_URI##*/})" | sha256sum -c
+tar -xzf ${APK_TOOLS_URI##*/}
+mv apk-tools-*/apk apk
 
 
 title 'Installing Alpine Linux'
@@ -25,7 +26,7 @@ echo "$MIRROR_URI/main" > etc/apk/repositories
 cp -R "$CLONE_DIR"/.travis/keys etc/apk/keys
 cp /etc/resolv.conf etc/resolv.conf
 
-/tmp/sbin/apk.static \
+/tmp/apk \
 	--root . --update-cache --initdb --no-progress \
 	add alpine-base
 
-- 
cgit v1.2.3