X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=bin%2Fsetup.sh;h=b242dc4ae1e4767f5a35750e9e7883718ea72178;hb=c346b0a8bea99a1ec1f12491ce1fceb74d50a426;hp=d0ed91589579a5934fdc904cb1f018e2f7381d9c;hpb=0292a407182886aa33207af0b0f5d2a3176c0bb4;p=civicrm-core.git diff --git a/bin/setup.sh b/bin/setup.sh index d0ed915895..b242dc4ae1 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -155,8 +155,20 @@ if [ -n "$DO_DOWNLOAD" ]; then NODE=$(pickcmd node nodejs) BOWER="$NODE $BOWER" fi - # Without the force flag bower won't check for new versions or verify that installed software matches version specified in bower.json - $BOWER install -f + # 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