From 48e20e55d003261b98e59ea0000271ec23e19c92 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Fri, 8 May 2015 14:57:02 +0200
Subject: [PATCH] Update Vagrant scripts to reflect new setup.

---
 Vagrantfile                   |  2 +-
 system/vagrant/environment.sh | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index b3f9f81..9e32fb7 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -69,7 +69,7 @@ symfony_root_folder   = "/vagrant/symfony" # Where to install Symfony.
 nodejs_version        = "latest"   # By default "latest" will equal the latest stable version
 nodejs_packages       = [          # List any global NodeJS packages that you want to install
   "bower",
-  "ember"
+  "gulp"
 ]
 
 sphinxsearch_version  = "rel22" # rel20, rel21, rel22, beta, daily, stable
diff --git a/system/vagrant/environment.sh b/system/vagrant/environment.sh
index 502f73b..19e545e 100644
--- a/system/vagrant/environment.sh
+++ b/system/vagrant/environment.sh
@@ -21,24 +21,22 @@ cp /vagrant/system/.env.example /vagrant/system/.env
 mysql -u root -proot -e 'create database flarum'
 
 ### Setup flarum/core and install dependencies ###
-cd /vagrant
-git submodule init
-git submodule update
 cd /vagrant/system/core
 composer install --prefer-dist
 cd /vagrant/system
 composer install --prefer-dist
 composer dump-autoload
 
-cd /vagrant/core/js
+cd /vagrant/system/core/js
 bower install
-cd /vagrant/core/js/forum
+cd /vagrant/system/core/js/forum
 npm install
 gulp
-cd /vagrant/core/js/admin
+cd /vagrant/system/core/js/admin
 npm install
 gulp
 
+cd /vagrant/system
 php artisan vendor:publish
 php artisan flarum:install
 php artisan flarum:seed