Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-19-19-40-00

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

diff --git a/bin/setup.sh b/bin/setup.sh
index eb31a8328feff404465bf7f24a6ecfb3d2fb230d..b242dc4ae1e4767f5a35750e9e7883718ea72178 100755 (executable)
--- a/bin/setup.sh
+++ b/bin/setup.sh
@@ -151,7 +151,24 @@ if [ -n "$DO_DOWNLOAD" ]; then
     fi
 
     BOWER=$(pickcmd node_modules/bower/bin/bower bower)
-    $BOWER install
+    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