From ab32879de9012e0f7b0c175751392b7b28afe6f7 Mon Sep 17 00:00:00 2001
From: Mike Dugan <mike@mjdugan.com>
Date: Wed, 24 Dec 2014 08:58:55 -0500
Subject: [PATCH] update scripts and vagrantfile

---
 .gitattributes         |  1 -
 Vagrantfile            |  1 +
 scripts/app.sh         |  8 ++++++++
 scripts/environment.sh | 12 +-----------
 scripts/workbench.sh   |  7 +++++++
 5 files changed, 17 insertions(+), 12 deletions(-)
 delete mode 100644 .gitattributes
 create mode 100644 scripts/app.sh
 create mode 100644 scripts/workbench.sh

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 176a458..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-* text=auto
diff --git a/Vagrantfile b/Vagrantfile
index 832f256..090431b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -316,5 +316,6 @@ Vagrant.configure("2") do |config|
   # Add these to the same directory as the Vagrantfile.
   ##########
   config.vm.provision "shell", path: "./scripts/environment.sh"
+  config.vm.provision "shell", path: "./scripts/workbench.sh"
 
 end
diff --git a/scripts/app.sh b/scripts/app.sh
new file mode 100644
index 0000000..6c73196
--- /dev/null
+++ b/scripts/app.sh
@@ -0,0 +1,8 @@
+#! /bin/bash
+
+cd /vagrant
+php artisan migrate --bench="flarum/core"
+php artisan db:seed --class="Flarum\Core\Support\Seeders\DatabaseSeeder"
+cd /vagrant/workbench/flarum/core/ember
+npm install
+bower install
diff --git a/scripts/environment.sh b/scripts/environment.sh
index af2c873..8827197 100644
--- a/scripts/environment.sh
+++ b/scripts/environment.sh
@@ -1,19 +1,9 @@
 #! /bin/bash
 
-
-
 cp /vagrant/.env.example.php /vagrant/.env.local.php
-
 sudo apt-get install phantomjs zsh exuberant-ctags
-
 curl -L http://install.ohmyz.sh | sh
 ## Comment the below line out if you don't want zsh
 chsh /bin/zsh vagrant
 
-cd /vagrant
-php artisan migrate --bench="flarum/core"
-php artisan db:seed --class="Flarum\Core\Support\Seeders\DatabaseSeeder"
-cd /vagrant/workbench/flarum/core/ember
-npm install
-bower install
-
+bash /vagrant/scripts/aliases.sh
diff --git a/scripts/workbench.sh b/scripts/workbench.sh
new file mode 100644
index 0000000..0c218ca
--- /dev/null
+++ b/scripts/workbench.sh
@@ -0,0 +1,7 @@
+#! /bin/bash
+
+mkdir -p /vagrant/workbench/flarum/core
+cd /vagrant/workbench/flarum/core
+git clone https://github.com/flarum/core .
+
+bash /vagrant/scripts/app.sh