AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

Remove pushd and popd spammy output

Browse Source
This commit is contained in:
nicolas.dorier
2019-06-13 16:39:30 +09:00
parent dd72f22b89
commit dec4fb1c14
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changedomain.sh
View File

@@ -13,7 +13,7 @@ echo "Changing domain from \"$OLD_HOST\" to \"$NEW_HOST\""
export BTCPAY_HOST="$NEW_HOST" export BTCPAY_HOST="$NEW_HOST"
export ACME_CA_URI="https://acme-v01.api.letsencrypt.org/directory" export ACME_CA_URI="https://acme-v01.api.letsencrypt.org/directory"
pushd . pushd . > /dev/null
# Modify environment file # Modify environment file
cd "$BTCPAY_BASE_DIRECTORY/btcpayserver-docker" cd "$BTCPAY_BASE_DIRECTORY/btcpayserver-docker"
. helpers.sh . helpers.sh

12
helpers.sh
View File

@@ -88,34 +88,34 @@ WOOCOMMERCE_HOST=$WOOCOMMERCE_HOST" > $BTCPAY_ENV_FILE
} }
btcpay_up() { btcpay_up() {
pushd . pushd . > /dev/null
cd "$(dirname "$BTCPAY_ENV_FILE")" cd "$(dirname "$BTCPAY_ENV_FILE")"
docker-compose -f $BTCPAY_DOCKER_COMPOSE up --remove-orphans -d -t "${COMPOSE_HTTP_TIMEOUT:-180}" 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" # Depending on docker-compose, either the timeout does not work, or "compose -d and --timeout cannot be combined"
if ! [ $? -eq 0 ]; then if ! [ $? -eq 0 ]; then
docker-compose -f $BTCPAY_DOCKER_COMPOSE up --remove-orphans -d docker-compose -f $BTCPAY_DOCKER_COMPOSE up --remove-orphans -d
fi fi
popd popd > /dev/null
} }
btcpay_down() { btcpay_down() {
pushd . pushd . > /dev/null
cd "$(dirname "$BTCPAY_ENV_FILE")" cd "$(dirname "$BTCPAY_ENV_FILE")"
docker-compose -f $BTCPAY_DOCKER_COMPOSE down -t "${COMPOSE_HTTP_TIMEOUT:-180}" docker-compose -f $BTCPAY_DOCKER_COMPOSE down -t "${COMPOSE_HTTP_TIMEOUT:-180}"
# Depending on docker-compose, the timeout does not work. # Depending on docker-compose, the timeout does not work.
if ! [ $? -eq 0 ]; then if ! [ $? -eq 0 ]; then
docker-compose -f $BTCPAY_DOCKER_COMPOSE down docker-compose -f $BTCPAY_DOCKER_COMPOSE down
fi fi
popd popd > /dev/null
} }
btcpay_restart() { btcpay_restart() {
pushd . pushd . > /dev/null
cd "$(dirname "$BTCPAY_ENV_FILE")" cd "$(dirname "$BTCPAY_ENV_FILE")"
docker-compose -f $BTCPAY_DOCKER_COMPOSE restart -t "${COMPOSE_HTTP_TIMEOUT:-180}" docker-compose -f $BTCPAY_DOCKER_COMPOSE restart -t "${COMPOSE_HTTP_TIMEOUT:-180}"
# Depending on docker-compose, the timeout does not work. # Depending on docker-compose, the timeout does not work.
if ! [ $? -eq 0 ]; then if ! [ $? -eq 0 ]; then
docker-compose -f $BTCPAY_DOCKER_COMPOSE restart docker-compose -f $BTCPAY_DOCKER_COMPOSE restart
fi fi
popd popd > /dev/null
} }