province abbreviation patch - issue 724

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

diff --git a/bin/setup.sh b/bin/setup.sh
index 2badb46673d68eafbc7d647b88bf289a0f51e82c..683bf5775cf4f4a55d478ecd8b1af92c943c6dec 100755 (executable)
--- a/bin/setup.sh
+++ b/bin/setup.sh
@@ -141,8 +141,10 @@ set -x
 
 if [ -n "$DO_DOWNLOAD" ]; then
   pushd "$CALLEDPATH/.."
-    COMPOSER=$(pickcmd composer composer.phar)
-    $COMPOSER install
+    if [ "$GENCODE_CMS" != "Drupal8" ]; then
+      COMPOSER=$(pickcmd composer composer.phar)
+      $COMPOSER install
+    fi
 
     if has_commands karma ; then
       ## dev dependencies have been installed globally; don't force developer to redownload
@@ -209,9 +211,9 @@ fi
 
 if [ -n "$DO_FLUSH" ]; then
   pushd "$CALLEDPATH/.."
-    # reset config_backend and userFrameworkResourceURL which gets set
+    # reset 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';"
+    $MYSQLCMD -e "UPDATE civicrm_setting SET value = NULL WHERE name = 'userFrameworkResourceURL';"
   popd
 fi