Dedupe permissions - allow safe mode merging based on 'merge duplicate contacts'

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

diff --git a/bin/setup.sh b/bin/setup.sh
index eb31a8328feff404465bf7f24a6ecfb3d2fb230d..2badb46673d68eafbc7d647b88bf289a0f51e82c 100755 (executable)
--- a/bin/setup.sh
+++ b/bin/setup.sh
@@ -60,6 +60,7 @@ while getopts "aDgsdef" opt; do
       DO_GENCODE=1
       DO_SCHEMA=1
       DO_DATA=1
+      DEFAULT_DATA=civicrm_generated.mysql
       DO_FLUSH=1
       FOUND_ACTION=1
       ;;
@@ -143,15 +144,12 @@ if [ -n "$DO_DOWNLOAD" ]; then
     COMPOSER=$(pickcmd composer composer.phar)
     $COMPOSER install
 
-    if has_commands bower karma ; then
+    if has_commands karma ; then
       ## dev dependencies have been installed globally; don't force developer to redownload
       npm install --production
     else
       npm install
     fi
-
-    BOWER=$(pickcmd node_modules/bower/bin/bower bower)
-    $BOWER install
   popd
 fi
 
@@ -211,9 +209,6 @@ fi
 
 if [ -n "$DO_FLUSH" ]; then
   pushd "$CALLEDPATH/.."
-    # run the cli script to build the menu and the triggers
-    "$PHP5PATH"php bin/cli.php -e System -a flush --triggers 1 --session 1
-
     # reset config_backend and userFrameworkResourceURL which gets set
     # when config object is initialized
     $MYSQLCMD -e "UPDATE civicrm_domain SET config_backend = NULL; UPDATE civicrm_setting SET value = NULL WHERE name = 'userFrameworkResourceURL';"