diff --git a/scripts/backup.sh b/scripts/backup.sh index 39a4832..b8418f4 100755 --- a/scripts/backup.sh +++ b/scripts/backup.sh @@ -18,6 +18,3 @@ if [ -z "$RESTIC_PASSWORD" ]; then fi python -m restic.backup --project zigbee-stack --services mqtt,z2m "$@" - -SCRIPT_DIR=$(readlink -f $(dirname "${BASH_SOURCE[0]}")) - diff --git a/scripts/clear_data.sh b/scripts/clear_data.sh index 924aa9b..c2e69bb 100755 --- a/scripts/clear_data.sh +++ b/scripts/clear_data.sh @@ -24,9 +24,9 @@ cleanup_except() { SCRIPT_DIR=$(readlink -f $(dirname "${BASH_SOURCE[0]}")) REPO_DIR=$(dirname $SCRIPT_DIR) -COMPOSE_FILE=$REPO_DIR/docker-compose.yml +alias compose="compose -f $REPO_DIR/docker-compose.yml" -docker compose -f $COMPOSE_FILE down +docker compose down cleanup_except "$REPO_DIR/mosquitto/config" mosquitto.conf cleanup_except "$REPO_DIR/mosquitto/data" .gitkeep diff --git a/scripts/create_password.sh b/scripts/create_password.sh index d35e6ba..3cc1310 100755 --- a/scripts/create_password.sh +++ b/scripts/create_password.sh @@ -3,13 +3,12 @@ set -e SCRIPT_DIR=$(readlink -f $(dirname "${BASH_SOURCE[0]}")) REPO_DIR=$(dirname $SCRIPT_DIR) -COMPOSE_FILE=$REPO_DIR/docker-compose.yml -ENV_FILE=$REPO_DIR/.env +alias compose="compose -f $REPO_DIR/docker-compose.yml" echo "Please input the mosquitto password:" read -s MOSQUITTO_PASSWORD -docker compose -f $COMPOSE_FILE run -it --rm mqtt mosquitto_passwd -b -c /mosquitto/config/pwfile homeassistant $MOSQUITTO_PASSWORD +docker compose run -it --rm mqtt mosquitto_passwd -b -c /mosquitto/config/pwfile homeassistant $MOSQUITTO_PASSWORD echo "password: $MOSQUITTO_PASSWORD" > $REPO_DIR/zigbee2mqtt/secret.yaml -chmod 600 $REPO_DIR/zigbee2mqtt/secret.yaml \ No newline at end of file +chmod 600 $REPO_DIR/zigbee2mqtt/secret.yaml