diff options
| author | Julien Danjou <julien@danjou.info> | 2016-02-12 15:47:51 +0100 |
|---|---|---|
| committer | Julien Danjou <julien@danjou.info> | 2016-06-09 10:40:16 +0200 |
| commit | 4906e72416a7724e70fff5f4052586a4de7065fa (patch) | |
| tree | cc1ed6dc414e2606b9e2741af7f849654a15e578 /setup-etcd-env.sh | |
| parent | 6daa485eeb3d0cf9ad3c0f354122799bafe54642 (diff) | |
| download | tooz-4906e72416a7724e70fff5f4052586a4de7065fa.tar.gz | |
Use pifpaf to setup daemons
Depends-On: Id3e6b694bb186724517599cd9875ad80ceeee053
Change-Id: I2265b4b83f136f2eeb21e86cda1c7ec36401d0a8
Diffstat (limited to 'setup-etcd-env.sh')
| -rwxr-xr-x | setup-etcd-env.sh | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/setup-etcd-env.sh b/setup-etcd-env.sh index d27fe8c..34fdf2a 100755 --- a/setup-etcd-env.sh +++ b/setup-etcd-env.sh @@ -1,16 +1,6 @@ #!/bin/bash set -eux - -clean_exit() { - local error_code="$?" - kill $(jobs -p) - return $error_code -} - -trap clean_exit EXIT -if [ -n "$(which etcd)" ]; then - etcd & -else +if [ -z "$(which etcd)" ]; then ETCD_VERSION=2.2.2 case `uname -s` in Darwin) @@ -35,9 +25,7 @@ else esac TARBALL_NAME=etcd-v${ETCD_VERSION}-$OS-$MACHINE test ! -d "$TARBALL_NAME" && curl -L https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/${TARBALL_NAME}.${SUFFIX} | tar xz - $TARBALL_NAME/etcd & + export PATH=$PATH:$TARBALL_NAME fi -export TOOZ_TEST_ETCD_URL="etcd://localhost:4001" -# Yield execution to venv command $* |