From d174c4cf52596b8d4008bff5b50fe3e71a57241b Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sun, 17 Mar 2013 02:33:15 -0700
Subject: [PATCH] Added submoudles, made more updates.

---
 .brew          |  3 ++-
 .emacs.d       |  1 +
 .gitmodules    |  6 ++++++
 bootstrap.sh   |  4 ++--
 setup.sh       | 41 +++++++++++++++++++++++++++++++++++++++++
 tmux-powerline |  1 +
 6 files changed, 53 insertions(+), 3 deletions(-)
 create mode 160000 .emacs.d
 create mode 100644 .gitmodules
 create mode 100755 setup.sh
 create mode 160000 tmux-powerline

diff --git a/.brew b/.brew
index 9816aca0..e3f2c02c 100755
--- a/.brew
+++ b/.brew
@@ -22,10 +22,11 @@ brew tap homebrew/dupes
 brew install homebrew/dupes/grep
 
 # Install everything else
+brew install emacs
+brew install git
 brew install tmux
 brew install nmap
 brew install readline
-brew install git
 
 # Remove outdated versions from the cellar
 brew cleanup
diff --git a/.emacs.d b/.emacs.d
new file mode 160000
index 00000000..f5cc9e43
--- /dev/null
+++ b/.emacs.d
@@ -0,0 +1 @@
+Subproject commit f5cc9e43e176703db05ce9da358783a7724ab913
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..2af5fd10
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "tmux-powerline"]
+	path = tmux-powerline
+	url = git@github.com:IvanMalison/tmux-powerline.git
+[submodule ".emacs.d"]
+	path = .emacs.d
+	url = git@github.com:IvanMalison/.emacs.d.git
diff --git a/bootstrap.sh b/bootstrap.sh
index 8a053a72..f29ba871 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -2,7 +2,7 @@
 cd "$(dirname "${BASH_SOURCE}")"
 git pull
 function doIt() {
-	rsync --exclude ".git/" --exclude ".DS_Store" --exclude "bootstrap.sh" --exclude "README.md" -av . ~
+	rsync --exclude "tmux-powerline" --exclude ".git/" --exclude ".DS_Store" --exclude "bootstrap.sh" --exclude "README.md" -av . ~
 }
 if [ "$1" == "--force" -o "$1" == "-f" ]; then
 	doIt
@@ -14,4 +14,4 @@ else
 	fi
 fi
 unset doIt
-source ~/.bash_profile
\ No newline at end of file
+source ~/.bash_profile
diff --git a/setup.sh b/setup.sh
new file mode 100755
index 00000000..a3d5f849
--- /dev/null
+++ b/setup.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+cd "$(dirname "${BASH_SOURCE}")"
+
+source bootstrap.sh
+
+case `uname` in
+    'Darwin')
+	hash gcc &>/dev/null
+	if [ $? -ne 0 ]
+	then
+	    echo "gcc not found."
+	    exit
+	    case `sw_vers | grep ProductVersion | awk '{print $2}' | awk 'BEGIN{FS="."}{print $2}'` in
+		'8')
+		    echo 'Mountain Lion Detected.'
+		    ;;
+		'7')
+		    echo 'Lion Detected.'
+		    ;;
+		*)
+		    exit -1
+		    ;;
+	    esac
+	else
+	    echo "gcc found."
+	    source ~/.osx
+	fi
+	hash brew &>/dev/null && echo "brew found." || ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)"
+	source .brew
+	;;
+    'Linux')
+	echo 'Linux'
+	hash apt-get &>/dev/null || echo 'apt-get is missing.' && exit
+	apt-get install build-essential
+	;;
+    *)
+	echo "Operating System not recognized; aborting."
+	exit
+esac
+
+tmux-powerline/generate_conf.sh
diff --git a/tmux-powerline b/tmux-powerline
new file mode 160000
index 00000000..a3acc1e2
--- /dev/null
+++ b/tmux-powerline
@@ -0,0 +1 @@
+Subproject commit a3acc1e209edc6853e99b0d64999d11e40912beb