X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=bin%2Fsetup.sh;h=2badb46673d68eafbc7d647b88bf289a0f51e82c;hb=b811ac0b255c9ccf752d5d24aa8d1ee492faa09e;hp=f71e7a6d74f615491a8648c0ca4ad83d37a24764;hpb=7fe5c7a148957348996b8b29fec112257159bce4;p=civicrm-core.git diff --git a/bin/setup.sh b/bin/setup.sh index f71e7a6d74..2badb46673 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -144,32 +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) - 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