github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Improve install scripts

Browse Source 
* Only use bash where needed (scripts with pipes that use -o pipefail)
* Make string comparisons POSIX compatible
* Handle whitespace(s) in GOPATH
* Remove superfluous quotes in variable assignments

Change-Id: If1ea55f06f402ded646b5085d4837c0996f90fab
Signed-off-by: Joakim Roubert <joakimr@axis.com>
This commit is contained in:
Joakim Roubert
2019-12-12 13:25:25 +01:00
parent 55698e6942
commit 499fbb0337
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
script/setup/install-protobuf
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env sh
# Copyright The containerd Authors.
@@ -18,7 +18,7 @@
#
# Downloads and installs protobuf
#
set -eu -o pipefail
set -eu
PROTOBUF_VERSION=3.7.0
GOARCH=$(go env GOARCH)
@@ -33,9 +33,9 @@ arm64)
;;
amd64|386)
if [ $GOOS == "windows" ]; then
if [ "$GOOS" = windows ]; then
wget -O $PROTOBUF_DIR/protobuf "https://github.com/google/protobuf/releases/download/v$PROTOBUF_VERSION/protoc-$PROTOBUF_VERSION-win32.zip"
elif [ $GOOS == "linux" ]; then
elif [ "$GOOS" = linux ]; then
wget -O $PROTOBUF_DIR/protobuf "https://github.com/google/protobuf/releases/download/v$PROTOBUF_VERSION/protoc-$PROTOBUF_VERSION-linux-x86_64.zip"
fi
unzip $PROTOBUF_DIR/protobuf -d /usr/local