Skip to content

Commit

Permalink
update_config.sql no longer exist
Browse files Browse the repository at this point in the history
  • Loading branch information
DawoudIO committed Nov 10, 2020
1 parent fb87b6b commit 44c622e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
1 change: 0 additions & 1 deletion travis-ci/setup-db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ echo "=============== db script import ================="
echo "=========================================================="
mysql -e "create database IF NOT EXISTS churchcrm_test;" -uroot;
mysql churchcrm_test < src/mysql/install/Install.sql -uroot;
mysql churchcrm_test < src/mysql/upgrade/update_config.sql -uroot;
echo "=============== db demo script import ================"
mysql churchcrm_test < demo/ChurchCRM-Database.sql -uroot;
echo "=============== db script import Done ================"
6 changes: 2 additions & 4 deletions vagrant/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ DB_PASS="root"
DB_HOST="localhost"

CRM_DB_INSTALL_SCRIPT="/vagrant/src/mysql/install/Install.sql"
CRM_DB_INSTALL_SCRIPT2="/vagrant/src/mysql/upgrade/update_config.sql"
CRM_DB_VAGRANT_SCRIPT="/vagrant/vagrant/vagrant.sql"
CRM_DB_USER="churchcrm"
CRM_DB_PASS="churchcrm"
Expand Down Expand Up @@ -41,7 +40,6 @@ sudo mysql -u"$DB_USER" -p"$DB_PASS" -e "FLUSH PRIVILEGES;"
echo "Database: user created with needed PRIVILEGES"

sudo mysql -u"$CRM_DB_USER" -p"$CRM_DB_PASS" "$CRM_DB_NAME" < $CRM_DB_INSTALL_SCRIPT
sudo mysql -u"$CRM_DB_USER" -p"$CRM_DB_PASS" "$CRM_DB_NAME" < $CRM_DB_INSTALL_SCRIPT2

echo "Database: tables and metadata deployed"

Expand Down Expand Up @@ -73,11 +71,11 @@ echo "=========================================================="

VERSION="$(npm --version)"
echo "Node vesrion: $VERSION"

mountpoint /vagrant/node_modules/ > /dev/null
ISMOUNTPOINT=$?

if [ $ISMOUNTPOINT -eq 0 ]; then
if [ $ISMOUNTPOINT -eq 0 ]; then
echo "/vagrant/node_modules is a mountpoint - don't touch"
else
echo "/vagrant/node_modules is not a mountpoint - nuke and mount"
Expand Down

0 comments on commit 44c622e

Please sign in to comment.