Skip to content
This repository was archived by the owner on Nov 19, 2020. It is now read-only.

Commit 0ce9992

Browse files
committed
Makefile, get-protec.sh: Use bsdtar instead of unzip
Apparently there are multiple implementations of 'unzip' floating around that take different flags. And the given invocations don't work with the version that I have. 'bsdtar' is pretty uniform from one place to another.
1 parent db7ff61 commit 0ce9992

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ go:
99
services:
1010
- docker
1111

12+
addons:
13+
apt:
14+
packages:
15+
- bsdtar
16+
1217
env:
1318
- K8S_CLIENT_TEST=1 KUBECONFIG=scripts/kubeconfig
1419

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ _output/bin/protoc:
4444
_output/kubernetes:
4545
mkdir -p _output
4646
curl -o _output/kubernetes.zip -L https://github.com/kubernetes/kubernetes/archive/v$(KUBE_VERSION).zip
47-
unzip _output/kubernetes.zip -d _output > /dev/null
47+
bsdtar -x -f _output/kubernetes.zip -C _output > /dev/null
4848
mv _output/kubernetes-$(KUBE_VERSION) _output/kubernetes
4949

5050
.PHONY: clean

scripts/get-protoc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ if [ "$OS" == "Darwin" ]; then
66
fi
77

88
curl -L -o _output/protoc.zip https://github.com/google/protobuf/releases/download/v3.5.1/protoc-3.5.1-${OS}-x86_64.zip
9-
unzip _output/protoc.zip bin/protoc -d _output
9+
bsdtar -x -f _output/protoc.zip -C _output bin/protoc

0 commit comments

Comments
 (0)