From afb1202114425652221bce5f6ebad7496b2e77f4 Mon Sep 17 00:00:00 2001
From: Mike Pirog <mike@kalamuna.com>
Date: Mon, 17 Oct 2016 19:58:37 -0700
Subject: [PATCH] #1656: Simplify dep installation

---
 .travis.yml  | 5 -----
 CHANGELOG.md | 5 +++++
 Gruntfile.js | 6 +-----
 package.json | 3 +++
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bb91928..99da6ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,6 @@ before_install:
   # Global install some npm
   - npm install -g grunt-cli
 
-  # Install the app deps
-  - cd "$TRAVIS_BUILD_DIR/app"
-  - npm install --production
-  - cd "$TRAVIS_BUILD_DIR"
-
   # Install kalabox
   - sudo apt-get -y update
   - sudo apt-get -y install iptables cgroup-bin bridge-utils curl
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97dec53..901670e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+v2.1.0-rc.2
+===========
+
+* Simplify installation of deps. [#1656](https://github.com/kalabox/kalabox/issues/1656)
+
 v2.1.0-rc.1
 ===========
 
diff --git a/Gruntfile.js b/Gruntfile.js
index 60e06b9..6b815bf 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -162,11 +162,7 @@ module.exports = function(grunt) {
             cwd: 'build'
           }
         },
-        command: [
-          'npm install --production',
-          'cd app',
-          'npm install --production'
-        ].join(' && ')
+        command: 'npm install --production'
       }
     }
 
diff --git a/package.json b/package.json
index f38b21c..c377ce6 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,9 @@
     "url": "http://github.com/kalabox/kalabox-app-php",
     "email": "mike@kalabox.io"
   },
+  "scripts" : {
+    "postinstall" : "cd app && npm install"
+  },
   "dependencies": {
     "lodash": "^3.7.0"
   },