From 744418db86cba4d7cb7fbcd3ba5ac7122dffdd26 Mon Sep 17 00:00:00 2001
From: Jacob Cody Wimer <jacob.wimer@gmail.com>
Date: Sat, 25 Mar 2017 00:41:41 +0000
Subject: [PATCH] Fixed line endings to unix

---
 .gitignore                             |  2 +-
 README.rdoc                            | 10 ++++-----
 Vagrantfile                            | 30 +++++++++++++-------------
 setup/Vagrant Windows Instructions.txt | 14 ++++++------
 setup/build.sh                         |  4 ++--
 setup/nvm-install.sh                   |  2 +-
 6 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2bc92fa..262fcb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-work/*
+work/*
 .vagrant/
\ No newline at end of file
diff --git a/README.rdoc b/README.rdoc
index 0005db4..6059e70 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,6 +1,6 @@
-# railsVagrant
-Ubuntu 14.04 vagrant template for rails development.
-
-To use, do the following:
-* Run <tt>vagrant up</tt>
+# railsVagrant
+Ubuntu 14.04 vagrant template for rails development.
+
+To use, do the following:
+* Run <tt>vagrant up</tt>
 * Run <tt>vagrant ssh</tt>
\ No newline at end of file
diff --git a/Vagrantfile b/Vagrantfile
index 069c4db..27fe1f4 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,15 +1,15 @@
-Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/trusty64"
-  config.vm.network "public_network"
-  config.vm.network "private_network", ip: "192.168.254.2"
-  config.vm.provision :shell, path: "setup/build.sh"
-  config.vm.provision :shell, path: "setup/rvm-install.sh", args: "stable", privileged: false
-  config.vm.provision :shell, path: "setup/ruby-install.sh", args: "2.4.0 rails", privileged: false
-  config.vm.provision :shell, path: "setup/nvm-install.sh", privileged: false
-  config.vm.provision :shell, path: "setup/other-user-setup.sh", privileged: false
-  config.vm.provider "virtualbox" do |v|
-    v.memory = 2048
-    v.cpus = 2
-    v.name = "developer"
-  end
-end
+Vagrant.configure("2") do |config|
+  config.vm.box = "ubuntu/trusty64"
+  config.vm.network "public_network"
+  config.vm.network "private_network", ip: "192.168.254.2"
+  config.vm.provision :shell, path: "setup/build.sh"
+  config.vm.provision :shell, path: "setup/rvm-install.sh", args: "stable", privileged: false
+  config.vm.provision :shell, path: "setup/ruby-install.sh", args: "2.4.0 rails", privileged: false
+  config.vm.provision :shell, path: "setup/nvm-install.sh", privileged: false
+  config.vm.provision :shell, path: "setup/other-user-setup.sh", privileged: false
+  config.vm.provider "virtualbox" do |v|
+    v.memory = 2048
+    v.cpus = 2
+    v.name = "developer"
+  end
+end
diff --git a/setup/Vagrant Windows Instructions.txt b/setup/Vagrant Windows Instructions.txt
index 3ee3914..6c4c501 100644
--- a/setup/Vagrant Windows Instructions.txt	
+++ b/setup/Vagrant Windows Instructions.txt	
@@ -1,8 +1,8 @@
-For Windows:
-1. Install GIT
-2. Open CMD and run: setx PATH=%PATH%;C:\Program Files (x86)\Git\bin
-3. Install Virtualbox
-4. Instal Vagrant
-5. Open CMD and navigate to railsVagrant folder
-6. From CMD run vagrant up
+For Windows:
+1. Install GIT
+2. Open CMD and run: setx PATH=%PATH%;C:\Program Files (x86)\Git\bin
+3. Install Virtualbox
+4. Instal Vagrant
+5. Open CMD and navigate to railsVagrant folder
+6. From CMD run vagrant up
 7. Run vagrant ssh
\ No newline at end of file
diff --git a/setup/build.sh b/setup/build.sh
index 2168e74..984a00a 100644
--- a/setup/build.sh
+++ b/setup/build.sh
@@ -3,8 +3,8 @@ apt-get update
 apt-get install software-properties-common python-software-properties curl git -y
 add-apt-repository ppa:ondrej/php -y
 apt-get update
-apt-get install php7.1 php7.1-common
-apt-get install php7.1-curl php7.1-xml php7.1-zip php7.1-gd php7.1-mysql php7.1-mbstring
+apt-get install php7.1 php7.1-common -y
+apt-get install php7.1-curl php7.1-xml php7.1-zip php7.1-gd php7.1-mysql php7.1-mbstring -y
 wget -qO- https://toolbelt.heroku.com/install-ubuntu.sh | sh
 
 #Docker install
diff --git a/setup/nvm-install.sh b/setup/nvm-install.sh
index a58c1ac..5cc4c39 100644
--- a/setup/nvm-install.sh
+++ b/setup/nvm-install.sh
@@ -1,3 +1,3 @@
 curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh | bash
-source ~/.bashrc
+source $HOME/.nvm/nvm.sh
 nvm install node
\ No newline at end of file