Skip to content

Commit cab5d76

Browse files
author
Matthew Fisher
committed
style(builder): styling nitpicks
1 parent a1f440c commit cab5d76

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

builder/templates/builder

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ puts-step() {
2626
echo "-----> $@"
2727
}
2828

29+
puts-step-sameline() {
30+
echo -n "-----> $@"
31+
}
32+
2933
puts-warn() {
3034
echo " ! $@"
3135
}
@@ -150,7 +154,7 @@ fi
150154
RELEASE_INFO=$(echo $RELEASE_INFO | sed -e 's/\"/\\\"/g')
151155
DOCKERFILE=$(echo $DOCKERFILE | sed -e 's/\"/\\\"/g')
152156

153-
indent "Launching..."
157+
puts-step-sameline "Launching... "
154158
URL="{{ .deis_controller_protocol }}://{{ .deis_controller_host }}:{{ .deis_controller_port }}/api/hooks/build"
155159
DATA="{\"sha\":\"$GIT_SHA\",\"receive_user\":\"$USER\",\"receive_repo\":\"$APP_NAME\",\"image\":\"$IMAGE_REFERENCE\",\"procfile\":\"$RELEASE_INFO\",\"dockerfile\":\"$DOCKERFILE\"}"
156160

@@ -163,9 +167,9 @@ RESPONSE=$(curl -s -XPOST \
163167

164168
RELEASE=$(echo $RESPONSE | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["release"]["version"]')
165169
DOMAIN=$(echo $RESPONSE | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["domains"][0]')
166-
indent "done, v$RELEASE"
167-
echo
170+
echo "done, v$RELEASE"
168171
puts-step "$APP_NAME deployed to Deis"
172+
echo
169173
indent "http://$DOMAIN"
170174
echo
171175
indent "To learn more, use \`deis help\` or visit http://deis.io"

builder/templates/gitreceive

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -eo pipefail
33

44
# Places cursor at start of line, so that subsequent text replaces existing text. For example;
55
# "remote: Updated branch 'master' of 'repo'. Deploying to dev." becomes
6-
# "------> Updated branch 'master' of 'repo'. Deploying to dev."
6+
# "Updated branch 'master' of 'repo'. Deploying to dev."
77
strip_remote_prefix() {
88
sed -u "s/^/"$'\e[1G'"/"
99
}

0 commit comments

Comments
 (0)