Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-04-01-46-50

[civicrm-core.git] / bin / regen.sh

diff --git a/bin/regen.sh b/bin/regen.sh
index 0ae005bdb31af7872900c722af64b835271ee9dd..3717b33dc20a42da3db5fb946613ba725b335206 100755 (executable)
--- 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.
@@ -12,14 +15,16 @@ fi
 
 pushd .
 cd $CIVISOURCEDIR
-svn up .
+# svn up .
 cd $CIVISOURCEDIR/bin
 ./setup.sh
 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,26 @@ 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; UPDATE civicrm_setting SET value = NULL WHERE name = 'userFrameworkResourceURL'  OR name = 'imageUploadURL';"
 
 cd $CIVISOURCEDIR/sql
-mysqldump -cent --skip-triggers -u $DBUSER $PASSWDSECTION $DBARGS $DBNAME > civicrm_generated.mysql
+$MYSQLDUMP -cent --skip-triggers $DBNAME > 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 ../CRM/Case/xml/configuration.sample/SampleConfig.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
+cat civicrm_dummy_processor.mysql >> civicrm_generated.mysql
+$MYSQLADMCMD -f drop $DBNAME
+$MYSQLADMCMD create $DBNAME
+$MYSQLCMD < civicrm.mysql
+$MYSQLCMD < civicrm_generated.mysql
 popd