From 8be15711c056bc6fea4c8006c252911be6bd3fdd Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Sun, 29 Mar 2015 22:35:44 +1030
Subject: [PATCH] Update vagrant scripts for new ember app location

---
 scripts/aliases        | 3 +--
 scripts/environment.sh | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/aliases b/scripts/aliases
index da71075..2b79136 100644
--- a/scripts/aliases
+++ b/scripts/aliases
@@ -33,8 +33,7 @@ alias ccf='./vendor/bin/codecept Functional'
 alias ccu='./vendor/bin/codecept run Unit'
 
 #ember/js stuff
-alias ember='/vagrant/flarum/core/ember/node_modules/ember-cli/bin/ember'
-alias esv='cd /vagrant/flarum/core/ember && /vagrant/flarum/core/ember/node_modules/ember-cli/bin/ember serve --output-path="../public"'
+alias ember='/vagrant/flarum/core/ember/forum/node_modules/ember-cli/bin/ember'
 
 #function aliases
 alias ghc=ghc
diff --git a/scripts/environment.sh b/scripts/environment.sh
index e379b72..3e54cd6 100644
--- a/scripts/environment.sh
+++ b/scripts/environment.sh
@@ -25,7 +25,10 @@ cd /vagrant/flarum/core
 git clone https://github.com/flarum/core .
 composer install --prefer-dist
 mkdir public
-cd /vagrant/flarum/core/ember
+cd /vagrant/flarum/core/ember/forum
+npm install
+bower install
+cd /vagrant/flarum/core/ember/admin
 npm install
 bower install