X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=bin%2Fregen.sh;h=f975c2e88aa67d8c582a3de2e854b96d61c973c3;hb=ea4ad8b1db40c54dced627d0a3ebb8913cefff4d;hp=250120e2ed2ce2fcf14cbfbd6f581b89feebce22;hpb=c60321926d8dd402ef21ae4a5b61d903e6170b32;p=civicrm-core.git

diff --git a/bin/regen.sh b/bin/regen.sh
index 250120e2ed..f975c2e88a 100755
--- a/bin/regen.sh
+++ b/bin/regen.sh
@@ -39,14 +39,16 @@ echo "SELECT table_name FROM information_schema.TABLES  WHERE TABLE_SCHEMA='${DB
 $MYSQLCMD < civicrm.mysql
 $MYSQLCMD < civicrm_data.mysql
 $MYSQLCMD < civicrm_sample.mysql
+echo "DROP TABLE IF EXISTS zipcodes" | $MYSQLCMD
 $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
+## For first boot on fresh DB, boot CMS before CRM.
+cms_eval 'civicrm_initialize();'
+
+php GenerateData.php
 
-$MYSQLCMD -e "DROP TABLE zipcodes; UPDATE civicrm_domain SET config_backend = NULL; DELETE FROM civicrm_extension; DELETE FROM civicrm_cache; DELETE FROM civicrm_setting;"
+## Prune local data
+$MYSQLCMD -e "DROP TABLE zipcodes; DROP TABLE IF EXISTS civicrm_install_canary; UPDATE civicrm_domain SET config_backend = NULL; DELETE FROM civicrm_extension; DELETE FROM civicrm_cache; DELETE FROM civicrm_setting;"
 TABLENAMES=$( echo "show tables like 'civicrm_%'" | $MYSQLCMD | grep ^civicrm_ | xargs )
 
 cd $CIVISOURCEDIR/sql