From dec4fb1c148a5011a6e64099aa74bdde4efee842 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 13 Jun 2019 16:39:30 +0900 Subject: [PATCH] Remove pushd and popd spammy output --- changedomain.sh | 2 +- helpers.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/changedomain.sh b/changedomain.sh index 7bc7b4d..966fedf 100755 --- a/changedomain.sh +++ b/changedomain.sh @@ -13,7 +13,7 @@ echo "Changing domain from \"$OLD_HOST\" to \"$NEW_HOST\"" export BTCPAY_HOST="$NEW_HOST" export ACME_CA_URI="https://acme-v01.api.letsencrypt.org/directory" -pushd . +pushd . > /dev/null # Modify environment file cd "$BTCPAY_BASE_DIRECTORY/btcpayserver-docker" . helpers.sh diff --git a/helpers.sh b/helpers.sh index 7d2eb3b..7294062 100755 --- a/helpers.sh +++ b/helpers.sh @@ -88,34 +88,34 @@ WOOCOMMERCE_HOST=$WOOCOMMERCE_HOST" > $BTCPAY_ENV_FILE } btcpay_up() { - pushd . + pushd . > /dev/null cd "$(dirname "$BTCPAY_ENV_FILE")" docker-compose -f $BTCPAY_DOCKER_COMPOSE up --remove-orphans -d -t "${COMPOSE_HTTP_TIMEOUT:-180}" # Depending on docker-compose, either the timeout does not work, or "compose -d and --timeout cannot be combined" if ! [ $? -eq 0 ]; then docker-compose -f $BTCPAY_DOCKER_COMPOSE up --remove-orphans -d fi - popd + popd > /dev/null } btcpay_down() { - pushd . + pushd . > /dev/null cd "$(dirname "$BTCPAY_ENV_FILE")" docker-compose -f $BTCPAY_DOCKER_COMPOSE down -t "${COMPOSE_HTTP_TIMEOUT:-180}" # Depending on docker-compose, the timeout does not work. if ! [ $? -eq 0 ]; then docker-compose -f $BTCPAY_DOCKER_COMPOSE down fi - popd + popd > /dev/null } btcpay_restart() { - pushd . + pushd . > /dev/null cd "$(dirname "$BTCPAY_ENV_FILE")" docker-compose -f $BTCPAY_DOCKER_COMPOSE restart -t "${COMPOSE_HTTP_TIMEOUT:-180}" # Depending on docker-compose, the timeout does not work. if ! [ $? -eq 0 ]; then docker-compose -f $BTCPAY_DOCKER_COMPOSE restart fi - popd + popd > /dev/null } \ No newline at end of file