From 1914b061658c8670ed098fe20af62f672f2ab60d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 2 Jan 2015 12:41:44 -0800
Subject: [PATCH] composer, setup.sh - Automatically call "composer install"

---
 bin/setup.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/setup.sh b/bin/setup.sh
index 535cf60492..4e47fbb88f 100755
--- a/bin/setup.sh
+++ b/bin/setup.sh
@@ -49,8 +49,12 @@ if [ -z $DBPASS ] ; then
   DBPASS=$REPLY
 fi
 
-# Install npm and bower modules
-npm install
+# download any PHP dependencies
+pushd "$CALLEDPATH/.."
+  composer install
+  # Install npm and bower modules
+  npm install
+popd
 
 # run code generator if it's there - which means it's
 # checkout, not packaged code
-- 
2.25.1