Merge branch 'develop' into bugfix/scoring-stuck-at-zero

Merge pull request 'folder name db changed to database in the path' (#23) from bugfix/change-path-to-renamed-folder into develop
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/23 Reviewed-by: Pőcze Bence <bence@pocze.ch>
2021-04-27 17:36:18 +02:00 · 2021-04-27 17:25:54 +02:00 · 2021-04-26 20:21:21 +02:00
1 changed files with 1 additions and 1 deletions
--- a/scripts/install.sh
+++ b/scripts/install.sh
@ -16,7 +16,7 @@ echo "Installing Yarn packages..."
 (cd ${ROOT_DIR}/public/static && yarn install)

 echo "Installing MapGuesser DB..."
-mysql --host=${DB_HOST} --user=${DB_USER} --password=${DB_PASSWORD} ${DB_NAME} < ${ROOT_DIR}/db/mapguesser.sql
+mysql --host=${DB_HOST} --user=${DB_USER} --password=${DB_PASSWORD} ${DB_NAME} < ${ROOT_DIR}/database/mapguesser.sql

 echo "Migrating DB..."
 (cd ${ROOT_DIR} && ./mapg db:migrate)
Author	SHA1	Message	Date
balazs	508a6899d8	Merge branch 'develop' into bugfix/scoring-stuck-at-zero All checks were successful default-pipeline default-pipeline #119 Details	2021-04-27 17:36:18 +02:00
balazs	04a897c958	Merge pull request 'folder name db changed to database in the path' (#23) from bugfix/change-path-to-renamed-folder into develop All checks were successful default-pipeline default-pipeline #116 Details Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/23 Reviewed-by: Pőcze Bence <bence@pocze.ch>	2021-04-27 17:25:54 +02:00
Balázs Vigh	d78817180b	folder name db changed to database in the path All checks were successful default-pipeline default-pipeline #113 Details	2021-04-26 20:21:21 +02:00