Added submoudles, made more updates.

This commit is contained in:
Ivan Malison 2013-03-17 02:33:15 -07:00
parent 876e8bb996
commit d174c4cf52
6 changed files with 53 additions and 3 deletions

3
.brew
View File

@ -22,10 +22,11 @@ brew tap homebrew/dupes
brew install homebrew/dupes/grep brew install homebrew/dupes/grep
# Install everything else # Install everything else
brew install emacs
brew install git
brew install tmux brew install tmux
brew install nmap brew install nmap
brew install readline brew install readline
brew install git
# Remove outdated versions from the cellar # Remove outdated versions from the cellar
brew cleanup brew cleanup

1
.emacs.d Submodule

@ -0,0 +1 @@
Subproject commit f5cc9e43e176703db05ce9da358783a7724ab913

6
.gitmodules vendored Normal file
View File

@ -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

View File

@ -2,7 +2,7 @@
cd "$(dirname "${BASH_SOURCE}")" cd "$(dirname "${BASH_SOURCE}")"
git pull git pull
function doIt() { 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 if [ "$1" == "--force" -o "$1" == "-f" ]; then
doIt doIt
@ -14,4 +14,4 @@ else
fi fi
fi fi
unset doIt unset doIt
source ~/.bash_profile source ~/.bash_profile

41
setup.sh Executable file
View File

@ -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

1
tmux-powerline Submodule

@ -0,0 +1 @@
Subproject commit a3acc1e209edc6853e99b0d64999d11e40912beb