Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

*: fix shellcheck warnings

Browse Source 
Fixes scripts and removes shellcheck warning suppressions.

* regexp warnings
* use ./*glob* so names don't become options
* use $(..) instead of legacy `..`
* read with -r to avoid mangling backslashes
* double quote to prevent globbing and word splitting
This commit is contained in:
Anthony Romano
2017-09-06 10:38:08 -07:00
parent 3c1845604b
commit 9abe9da9db
10 changed files with 149 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/build-docker
View File

@@ -10,21 +10,21 @@ fi
VERSION=${1}
ARCH=$(go env GOARCH)
DOCKERFILE="Dockerfile-release"
: ${TAG:="quay.io/coreos/etcd"}
if [ -z "$TAG" ]; then TAG="quay.io/coreos/etcd"; fi
if [ -z ${BINARYDIR} ]; then
RELEASE="etcd-${1}"-`go env GOOS`-`go env GOARCH`
if [ -z "${BINARYDIR}" ]; then
RELEASE="etcd-${1}"-$(go env GOOS)-$(go env GOARCH)
BINARYDIR="${RELEASE}"
TARFILE="${RELEASE}.tar.gz"
TARURL="https://github.com/coreos/etcd/releases/download/${1}/${TARFILE}"
if ! curl -f -L -o ${TARFILE} ${TARURL} ; then
if ! curl -f -L -o "${TARFILE}" "${TARURL}" ; then
echo "Failed to download ${TARURL}."
exit 1
fi
tar -zvxf ${TARFILE}
tar -zvxf "${TARFILE}"
fi
if [ ${ARCH} != "amd64" ]; then
if [ "${ARCH}" != "amd64" ]; then
DOCKERFILE+=".${ARCH}"
VERSION+="-${ARCH}"
fi
@@ -34,10 +34,10 @@ BUILDDIR=${BUILDDIR:-.}
IMAGEDIR=${BUILDDIR}/image-docker
mkdir -p ${IMAGEDIR}/var/etcd
mkdir -p ${IMAGEDIR}/var/lib/etcd
cp ${BINARYDIR}/etcd ${BINARYDIR}/etcdctl ${IMAGEDIR}
mkdir -p "${IMAGEDIR}"/var/etcd
mkdir -p "${IMAGEDIR}"/var/lib/etcd
cp "${BINARYDIR}"/etcd "${BINARYDIR}"/etcdctl "${IMAGEDIR}"
cat ./${DOCKERFILE} > ${IMAGEDIR}/Dockerfile
cat ./"${DOCKERFILE}" > "${IMAGEDIR}"/Dockerfile
docker build -t ${TAG}:${VERSION} ${IMAGEDIR}
docker build -t "${TAG}:${VERSION}" "${IMAGEDIR}"