Merge pull request #16411 from colemanw/api4EntityDoc

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

diff --git a/bin/setup.sh b/bin/setup.sh
index f71e7a6d74f615491a8648c0ca4ad83d37a24764..cabd301038f16077ae10b514b0d4d3b1b955e7af 100755 (executable)
--- a/bin/setup.sh
+++ b/bin/setup.sh
@@ -141,35 +141,17 @@ 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 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)
-    if [ -f "$BOWER" ]; then
-      NODE=$(pickcmd node nodejs)
-      BOWER="$NODE $BOWER"
-    fi
-    # Without the force flag, bower may not check for new versions or verify that installed software matches version specified in bower.json
-    # With the force flag, bower will ignore all caches and download all deps.
-    if [ -n "$OFFLINE" ]; then
-      BOWER_OPT=
-    elif [ ! -f "bower_components/.setupsh.ts" ]; then
-      ## First run -- or cleanup from failed run
-      BOWER_OPT=-f
-    elif [ "bower.json" -nt "bower_components/.setupsh.ts" ]; then
-      ## Bower.json has changed since last run
-      BOWER_OPT=-f
-    fi
-    [ -f "bower_components/.setupsh.ts" ] && rm -f "bower_components/.setupsh.ts"
-    $BOWER install $BOWER_OPT
-    touch bower_components/.setupsh.ts
   popd
 fi