From 860e69862023477976994577a4bba1f3ace60756 Mon Sep 17 00:00:00 2001
From: Mike Dugan <mike@mjdugan.com>
Date: Sun, 28 Dec 2014 01:13:37 -0500
Subject: [PATCH] rock and roll!

---
 public/packages/.gitkeep | 0
 scripts/aliases          | 3 ++-
 scripts/environment.sh   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 public/packages/.gitkeep

diff --git a/public/packages/.gitkeep b/public/packages/.gitkeep
old mode 100644
new mode 100755
diff --git a/scripts/aliases b/scripts/aliases
index 59ae0de..c796685 100644
--- a/scripts/aliases
+++ b/scripts/aliases
@@ -33,7 +33,8 @@ alias ccf='./vendor/bin/codecept Functional'
 alias ccu='./vendor/bin/codecept run Unit'
 
 #ember/js stuff
-alias esv='ember serve --output-path="/vagrant/workbench/flarum/core/public"'
+alias ember='/vagrant/workbench/flarum/core/ember/node_modules/ember-cli/bin/ember'
+alias esv='cd /vagrant/workbench/flarum/core/ember && /vagrant/workbench/flarum/core/ember/node_modules/ember-cli/bin/ember serve --output-path="../public"'
 
 #function aliases
 alias ghc=ghc
diff --git a/scripts/environment.sh b/scripts/environment.sh
index 674d272..56fe8f6 100644
--- a/scripts/environment.sh
+++ b/scripts/environment.sh
@@ -24,6 +24,7 @@ mysql -u root -proot -e 'create database flarum'
 cd /vagrant/workbench/flarum/core
 git clone https://github.com/flarum/core .
 composer install
+mkdir public
 cd /vagrant/workbench/flarum/core/ember
 npm install
 bower install