Made setup not automatically do all that brew stuff.

This commit is contained in:
Ivan Malison 2013-03-18 09:56:29 -07:00
parent 051d9c3bd5
commit 5176a24540
2 changed files with 41 additions and 37 deletions

View File

@ -1,6 +1,5 @@
#!/bin/bash #!/bin/bash
cd "$(dirname "${BASH_SOURCE}")" cd "$(dirname "${BASH_SOURCE}")"
git pull
function doIt() { function doIt() {
rsync --exclude "oh-my-zsh" --exclude "tmux-powerline" --exclude ".git/" --exclude ".DS_Store" --exclude "bootstrap.sh" --exclude "README.md" --exclude "setup.sh" -av . ~ rsync --exclude "oh-my-zsh" --exclude "tmux-powerline" --exclude ".git/" --exclude ".DS_Store" --exclude "bootstrap.sh" --exclude "README.md" --exclude "setup.sh" -av . ~
} }

View File

@ -1,44 +1,49 @@
#!/bin/bash #!/bin/bash
# Go to the source directory of this script. # Go to the source directory of this script.
cd "$(dirname "${BASH_SOURCE}")" cd "$(dirname "${BASH_SOURCE}")"
sudo -v
source bootstrap.sh
case `uname` in function install_essentials() {
'Darwin') case `uname` in
hash gcc &>/dev/null 'Darwin')
if [ $? -ne 0 ] hash gcc &>/dev/null
then if [ $? -ne 0 ]
echo "gcc not found." 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 exit
case `sw_vers | grep ProductVersion | awk '{print $2}' | awk 'BEGIN{FS="."}{print $2}'` in esac
'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
sudo -v
echo "Installing Dot Files."
source bootstrap.sh
[ "$1" == "--install" -o "$1" == "-i" ] && install_essentials
echo "Installing Tmux Configuration." echo "Installing Tmux Configuration."
tmux-powerline/generate_conf.sh tmux-powerline/generate_conf.sh
echo "Installing oh-my-zsh." echo "Installing oh-my-zsh."