*: clear rarer shellcheck errors on scripts

Clean up the tail of the warnings
This commit is contained in:
Anthony Romano
2017-06-03 11:02:08 -07:00
parent 17ad275124
commit 85f433232a
7 changed files with 52 additions and 48 deletions

View File

@@ -71,7 +71,7 @@ acbuild --debug port add peer tcp 2380
acbuild --debug copy "$TMPHOSTS" /etc/hosts
acbuild --debug label add arch $(go2aci ${GOARCH})
acbuild --debug label add arch "$(go2aci ${GOARCH})"
# mkdir default data-dir
mkdir -p .acbuild/currentaci/rootfs/var/lib/etcd

View File

@@ -17,8 +17,7 @@ if [ -z ${BINARYDIR} ]; then
BINARYDIR="${RELEASE}"
TARFILE="${RELEASE}.tar.gz"
TARURL="https://github.com/coreos/etcd/releases/download/${1}/${TARFILE}"
curl -f -L -o ${TARFILE} ${TARURL}
if [ $? != 0 ]; then
if ! curl -f -L -o ${TARFILE} ${TARURL} ; then
echo "Failed to download ${TARURL}."
exit 1
fi

View File

@@ -57,7 +57,7 @@ popd
for dir in ${DIRS}; do
pushd ${dir}
protoc --gofast_out=plugins=grpc,import_prefix=github.com/coreos/:. -I=.:"${GOGOPROTO_PATH}":"${COREOS_ROOT}":"${GRPC_GATEWAY_ROOT}/third_party/googleapis" *.proto
protoc --gofast_out=plugins=grpc,import_prefix=github.com/coreos/:. -I=".:${GOGOPROTO_PATH}:${COREOS_ROOT}:${GRPC_GATEWAY_ROOT}/third_party/googleapis" *.proto
sed -i.bak -E "s/github\.com\/coreos\/(gogoproto|github\.com|golang\.org|google\.golang\.org)/\1/g" *.pb.go
sed -i.bak -E 's/github\.com\/coreos\/(errors|fmt|io)/\1/g' *.pb.go
sed -i.bak -E 's/import _ \"gogoproto\"//g' *.pb.go

View File

@@ -21,7 +21,7 @@ if ! command -v docker >/dev/null; then
exit 1
fi
ETCD_ROOT=$(dirname "${BASH_SOURCE}")/..
ETCD_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
pushd ${ETCD_ROOT} >/dev/null
echo Building etcd binary...

View File

@@ -43,7 +43,7 @@ pushd "${GLIDE_VC_ROOT}"
popd
if [ -n "$1" ]; then
echo "glide get on $(echo $1)"
echo "glide get on $1"
matches=`grep "name: $1" glide.lock`
if [ ! -z "$matches" ]; then
echo "glide update on $1"