From 64544cbe2f77f916f27a18b9871c006ea0f2a339 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 3 Jul 2019 14:43:27 +0900 Subject: [PATCH] Small refactoring --- btcpay-setup.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index aee9fca..c4dc495 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -378,15 +378,13 @@ if ! [[ -x "$(command -v docker)" ]] || ! [[ -x "$(command -v docker-compose)" ] echo "Trying to install docker-compose by downloading on $DOCKER_COMPOSE_DOWNLOAD ($(uname -m))" curl -L "$DOCKER_COMPOSE_DOWNLOAD" -o /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose - else + elif $HAS_DOCKER; then echo "Trying to install docker-compose by using the docker-compose-builder ($(uname -m))" ! [[ -d "dist" ]] && mkdir dist - if $HAS_DOCKER; then - docker run --rm -ti -v "$(pwd)/dist:/dist" btcpayserver/docker-compose-builder:1.23.2 - mv dist/docker-compose /usr/local/bin/docker-compose - chmod +x /usr/local/bin/docker-compose - rm -rf "dist" - fi + docker run --rm -ti -v "$(pwd)/dist:/dist" btcpayserver/docker-compose-builder:1.23.2 + mv dist/docker-compose /usr/local/bin/docker-compose + chmod +x /usr/local/bin/docker-compose + rm -rf "dist" fi fi fi