From 18458a76677189ab2c7de1c04d01b12c727dc679 Mon Sep 17 00:00:00 2001 From: Benjamin Calef Date: Tue, 15 Feb 2022 15:57:34 +0100 Subject: [PATCH] [v1.4.2] improve MySQL import script --- README.md | 2 +- provision/100-magento-pre.sh | 7 +------ provision/110-magento-app.sh | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 09be0de..8973d7d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![vagrant](https://img.shields.io/badge/vagrant-debian:stretch-blue.svg?longCache=true&style=flat&label=vagrant&logo=vagrant)](https://app.vagrantup.com/debian/boxes/stretch64) [![dev-box](https://img.shields.io/badge/git/composer-blue.svg?longCache=true&style=flat&label=setup&logo=magento)](https://github.com/zepgram/magento2-fast-vm/blob/master/config.yaml.example) [![mount](https://img.shields.io/badge/nfs/rsync-blue.svg?longCache=true&style=flat&label=mount)](https://github.com/zepgram/magento2-fast-vm/releases) -[![release](https://img.shields.io/badge/release-v1.4.1-blue.svg?longCache=true&style=flat&label=release)](https://github.com/zepgram/magento2-fast-vm/releases) +[![release](https://img.shields.io/badge/release-v1.4.2-blue.svg?longCache=true&style=flat&label=release)](https://github.com/zepgram/magento2-fast-vm/releases) [![license](https://img.shields.io/badge/license-MIT-blue.svg?longCache=true&style=flat&label=license)](https://github.com/zepgram/magento2-fast-vm/blob/master/LICENSE) ![windows](https://img.shields.io/badge/windows-ok-green.svg?longCache=true&style=flat&label=windows&logo=windows) diff --git a/provision/100-magento-pre.sh b/provision/100-magento-pre.sh index 523ed38..1a59f17 100644 --- a/provision/100-magento-pre.sh +++ b/provision/100-magento-pre.sh @@ -89,14 +89,9 @@ chown -R vagrant:vagrant /home/vagrant # Execute import sql if [ -f /home/vagrant/extra/db-dump.sql.gz ]; then - rm -f /home/vagrant/extra/db-dump.sql - gunzip /home/vagrant/extra/db-dump.sql.gz -fi -if [ -f /home/vagrant/extra/db-dump.sql ]; then echo '--- Magento db dump import ---' - mysql -u vagrant -pvagrant -e "USE ${PROJECT_NAME};SET FOREIGN_KEY_CHECKS = 0;source /home/vagrant/extra/db-dump.sql;SET FOREIGN_KEY_CHECKS = 1;" + zcat /home/vagrant/extra/db-dump.sql.gz | mysql --init-command="SET SESSION FOREIGN_KEY_CHECKS=0;" --user=vagrant --password=vagrant "${PROJECT_NAME}" fi - # Extra pre-build if [ -f /home/vagrant/extra/100-pre-build.sh ]; then bash /home/vagrant/extra/100-pre-build.sh diff --git a/provision/110-magento-app.sh b/provision/110-magento-app.sh index 1d9cbb2..0c23a83 100644 --- a/provision/110-magento-app.sh +++ b/provision/110-magento-app.sh @@ -31,7 +31,7 @@ else # Install from git sudo -u vagrant git clone "$PROJECT_REPOSITORY" "$PROJECT_BUILD" cd "$PROJECT_BUILD"; sudo -u vagrant git fetch --all; git checkout "$PROJECT_SOURCE" --force; - rm -f app/etc/config.php app/etc/env.php + rm -f "$PROJECT_BUILD"/app/etc/config.php "$PROJECT_BUILD"/app/etc/env.php fi # Composer install