Merge commit 'c03f7d50ff6bc14d17b0c25201e6570dd84e5211' into shfmt

This commit is contained in:
Paul Bellamy
2016-10-26 15:32:28 +01:00
11 changed files with 391 additions and 341 deletions

View File

@@ -3,8 +3,8 @@
set -eu
if [ $# -ne 1 ]; then
echo "Usage: $0 <host>"
exit 1
echo "Usage: $0 <host>"
exit 1
fi
HOST=$1
@@ -12,10 +12,10 @@ HOST=$1
echo "Starting proxy container..."
PROXY_CONTAINER=$(ssh "$HOST" weave run -d weaveworks/socksproxy)
function finish {
echo "Removing proxy container.."
# shellcheck disable=SC2029
ssh "$HOST" docker rm -f "$PROXY_CONTAINER"
function finish() {
echo "Removing proxy container.."
# shellcheck disable=SC2029
ssh "$HOST" docker rm -f "$PROXY_CONTAINER"
}
trap finish EXIT