Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for latest shfmt #95

Merged
merged 1 commit into from
May 9, 2017
Merged

Update for latest shfmt #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/golang/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ fi
# will have awkward ownership. So we switch to a user with the
# same user and group IDs as source directory. We have to set a
# few things up so that sudo works without complaining later on.
uid=$(stat --format="%u" $SRC_PATH)
gid=$(stat --format="%g" $SRC_PATH)
uid=$(stat --format="%u" "$SRC_PATH")
gid=$(stat --format="%g" "$SRC_PATH")
echo "weave:x:$uid:$gid::$SRC_PATH:/bin/sh" >>/etc/passwd
echo "weave:*:::::::" >>/etc/shadow
echo "weave ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
Expand Down
2 changes: 1 addition & 1 deletion build/haskell/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ if [ -z "${SRC_PATH:-}" ]; then
exit 1
fi

make -C $SRC_PATH BUILD_IN_CONTAINER=false $*
make -C "$SRC_PATH" BUILD_IN_CONTAINER=false "$@"
8 changes: 4 additions & 4 deletions push-images
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ done

push_image() {
local image="$1"
docker push ${image}:${IMAGE_TAG}
docker push "${image}:${IMAGE_TAG}"
}

for image in ${IMAGES}; do
Expand All @@ -38,12 +38,12 @@ for image in ${IMAGES}; do
echo "Will push ${image}:${IMAGE_TAG}"
push_image "${image}" &

if [ -z "NO_DOCKER_HUB" ]; then
if [ -z "$NO_DOCKER_HUB" ]; then
# remove the quey prefix and push to docker hub
docker_hub_image=${image#$QUAY_PREFIX}
docker tag ${image}:${IMAGE_TAG} ${docker_hub_image}:${IMAGE_TAG}
docker tag "${image}:${IMAGE_TAG}" "${docker_hub_image}:${IMAGE_TAG}"
echo "Will push ${docker_hub_image}:${IMAGE_TAG}"
docker push ${docker_hub_image}:${IMAGE_TAG}
docker push "${docker_hub_image}:${IMAGE_TAG}"
fi
done

Expand Down