From 4cfa4439e8b782299cd611d8bb5eace23d309e2e Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 12 Jun 2019 12:49:22 +0900 Subject: [PATCH] Fix pushd --- changedomain.sh | 2 +- helpers.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/changedomain.sh b/changedomain.sh index 79ea871..7bc7b4d 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 . # Modify environment file cd "$BTCPAY_BASE_DIRECTORY/btcpayserver-docker" . helpers.sh diff --git a/helpers.sh b/helpers.sh index 2fa7cf8..86baad6 100755 --- a/helpers.sh +++ b/helpers.sh @@ -85,7 +85,7 @@ WOOCOMMERCE_HOST=$WOOCOMMERCE_HOST" > $BTCPAY_ENV_FILE } btcpay_up() { - pushd + pushd . 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" @@ -96,7 +96,7 @@ btcpay_up() { } btcpay_down() { - pushd + pushd . 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. @@ -107,7 +107,7 @@ btcpay_down() { } btcpay_restart() { - pushd + pushd . 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.