X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=bin%2Fregen.sh;h=ff3f033593377abf90e0a3bd1b6f57915036aa55;hb=c346b0a8bea99a1ec1f12491ce1fceb74d50a426;hp=378be1c62a94205666778d2c5e18b29b26317fc7;hpb=563371cb8826fc5c5ec3089d6ee82d945a2dabd7;p=civicrm-core.git

diff --git a/bin/regen.sh b/bin/regen.sh
index 378be1c62a..ff3f033593 100755
--- a/bin/regen.sh
+++ b/bin/regen.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env /bin/bash
+set -e
+set -x
 
 source `dirname $0`/setup.conf
+source `dirname $0`/setup.lib.sh
 
 # someone might want to use empty password for development,
 # let's make it possible - we asked before.
@@ -19,7 +22,9 @@ cd $CIVISOURCEDIR/sql
 
 echo; echo "Dropping civicrm_* tables from database $DBNAME"
 # mysqladmin -f -u $DBUSER $PASSWDSECTION $DBARGS drop $DBNAME
-MYSQLCMD="mysql -u$DBUSER $PASSWDSECTION $DBARGS $DBNAME"
+MYSQLCMD=$(mysql_cmd)
+MYSQLADMCMD=$(mysqladmin_cmd)
+MYSQLDUMP=$(mysqldump_cmd)
 echo "SELECT table_name FROM information_schema.TABLES  WHERE TABLE_SCHEMA='${DBNAME}' AND TABLE_TYPE = 'VIEW'" \
   | $MYSQLCMD \
   | grep '^\(civicrm_\|log_civicrm_\)' \
@@ -31,26 +36,28 @@ echo "SELECT table_name FROM information_schema.TABLES  WHERE TABLE_SCHEMA='${DB
   | awk -v NOFOREIGNCHECK='SET FOREIGN_KEY_CHECKS=0;' 'BEGIN {print NOFOREIGNCHECK}{print "drop table " $1 ";"}' \
   | $MYSQLCMD
 
-mysql -u$DBUSER $PASSWDSECTION $DBARGS $DBNAME < civicrm.mysql
-mysql -u$DBUSER $PASSWDSECTION $DBARGS $DBNAME < civicrm_data.mysql
-mysql -u$DBUSER $PASSWDSECTION $DBARGS $DBNAME < civicrm_sample.mysql
-mysql -u$DBUSER $PASSWDSECTION $DBARGS $DBNAME < zipcodes.mysql
+$MYSQLCMD < civicrm.mysql
+$MYSQLCMD < civicrm_data.mysql
+$MYSQLCMD < civicrm_sample.mysql
+$MYSQLCMD < zipcodes.mysql
 php GenerateData.php
 
 # run the cli script to build the menu and the triggers
 cd $CIVISOURCEDIR
 "$PHP5PATH"php bin/cli.php -e System -a flush --triggers 1 --session 1
 
-mysql -u$DBUSER $PASSWDSECTION $DBARGS $DBNAME -e "DROP TABLE zipcodes; UPDATE civicrm_domain SET config_backend = NULL; UPDATE civicrm_setting SET value = NULL WHERE name = 'userFrameworkResourceURL'  OR name = 'imageUploadURL';"
+$MYSQLCMD -e "DROP TABLE zipcodes; UPDATE civicrm_domain SET config_backend = NULL; DELETE FROM civicrm_extension; DELETE FROM civicrm_cache; UPDATE civicrm_setting SET value = NULL WHERE group_name IN ('Directory Preferences','URL Preferences');"
+TABLENAMES=$( echo "show tables like 'civicrm_%'" | $MYSQLCMD | grep ^civicrm_ | xargs )
 
 cd $CIVISOURCEDIR/sql
-mysqldump -cent --skip-triggers -u $DBUSER $PASSWDSECTION $DBARGS $DBNAME > civicrm_generated.mysql
+
+$MYSQLDUMP -cent --skip-triggers $DBNAME $TABLENAMES > civicrm_generated.mysql
 #cat civicrm_sample_report.mysql >> civicrm_generated.mysql
 cat civicrm_sample_custom_data.mysql >> civicrm_generated.mysql
 #cat civicrm_devel_config.mysql >> civicrm_generated.mysql
 cat civicrm_dummy_processor.mysql >> civicrm_generated.mysql
-mysqladmin -f -u$DBUSER $PASSWDSECTION $DBARGS drop $DBNAME
-mysqladmin -u$DBUSER $PASSWDSECTION $DBARGS create $DBNAME
-mysql -u$DBUSER $PASSWDSECTION $DBARGS $DBNAME < civicrm.mysql
-mysql -u$DBUSER $PASSWDSECTION $DBARGS $DBNAME < civicrm_generated.mysql
+$MYSQLADMCMD -f drop $DBNAME
+$MYSQLADMCMD create $DBNAME
+$MYSQLCMD < civicrm.mysql
+$MYSQLCMD < civicrm_generated.mysql
 popd