From f616dc054f5c9d2077e6562f9543ca1f1227865b Mon Sep 17 00:00:00 2001 From: Matthew Exon Date: Sat, 13 Apr 2024 22:24:30 +0200 Subject: [PATCH] allow overriding password during local testing --- bin/dev/autotest.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/dev/autotest.sh b/bin/dev/autotest.sh index b6f67cf118..604e99fcdb 100755 --- a/bin/dev/autotest.sh +++ b/bin/dev/autotest.sh @@ -152,8 +152,8 @@ function execute_tests() { echo "To use the docker container set the USEDOCKER environment variable" exit 3 fi - mysql -u "${DATABASE_USER}" -pfriendica -e "DROP DATABASE IF EXISTS ${DATABASE_NAME}" -h ${DATABASE_HOST} || true - mysql -u "${DATABASE_USER}" -pfriendica -e "CREATE DATABASE ${DATABASE_NAME} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h ${DATABASE_HOST} + mysql -u "${DATABASE_USER}" -p"${DATABASE_PASSWORD}" -e "DROP DATABASE IF EXISTS ${DATABASE_NAME}" -h ${DATABASE_HOST} || true + mysql -u "${DATABASE_USER}" -p"${DATABASE_PASSWORD}" -e "CREATE DATABASE ${DATABASE_NAME} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h ${DATABASE_HOST} else DATABASE_HOST=mysql fi @@ -185,8 +185,8 @@ function execute_tests() { echo "To use the docker container set the USEDOCKER environment variable" exit 3 fi - mysql -u "${DATABASE_USER}" -pfriendica -e "DROP DATABASE IF EXISTS ${DATABASE_NAME}" -h ${DATABASE_HOST} || true - mysql -u "${DATABASE_USER}" -pfriendica -e "CREATE DATABASE ${DATABASE_NAME} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h ${DATABASE_HOST} + mysql -u "${DATABASE_USER}" -p"${DATABASE_PASSWORD}" -e "DROP DATABASE IF EXISTS ${DATABASE_NAME}" -h ${DATABASE_HOST} || true + mysql -u "${DATABASE_USER}" -p"${DATABASE_PASSWORD}" -e "CREATE DATABASE ${DATABASE_NAME} DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" -h ${DATABASE_HOST} else DATABASE_HOST=mariadb fi @@ -203,7 +203,7 @@ function execute_tests() { if [ -n "${USEDOCKER}" ]; then echo "Initialize database..." - docker exec ${DOCKER_CONTAINER_ID} mysql -u root -pfriendica -e "CREATE DATABASE IF NOT EXISTS ${DATABASE_NAME};" + docker exec ${DOCKER_CONTAINER_ID} mysql -u root -p"${DATABASE_PASSWORD}" -e "CREATE DATABASE IF NOT EXISTS ${DATABASE_NAME};" fi export MYSQL_HOST="${DATABASE_HOST}"