Merge branch 'master' of github.com:erynofwales/dotfiles

Conflicts:
	setup.sh
This commit is contained in:
Eryn Wells 2012-03-14 17:36:41 -07:00
commit 4f1904cc05

View file

@ -2,16 +2,16 @@
dfdir=$(cd "$(dirname "$0")" && pwd) dfdir=$(cd "$(dirname "$0")" && pwd)
ln -s $dfdir/profile $HOME/.profile ln -s "$dfdir/profile" "$HOME/.profile"
ln -s $dfdir/rc $HOME/.rc ln -s "$dfdir/rc" "$HOME/.rc"
ln -s $dfdir/zshrc $HOME/.zshrc ln -s "$dfdir/zshrc" "$HOME/.zshrc"
ln -s $dfdir/zsh $HOME/.zsh ln -s "$dfdir/zsh" "$HOME/.zsh"
ln -s $dfdir/zprofile $HOME/.zprofile ln -s "$dfdir/zprofile" "$HOME/.zprofile"
ln -s $dfdir/zshenv $HOME/.zshenv ln -s "$dfdir/zshenv" "$HOME/.zshenv"
ln -s $dfdir/vimrc $HOME/.vimrc ln -s "$dfdir/vimrc" "$HOME/.vimrc"
ln -s $dfdir/vim $HOME/.vim ln -s "$dfdir/vim" "$HOME/.vim"
ln -s $dfdir/indent.pro $HOME/.indent.pro ln -s $dfdir/indent.pro $HOME/.indent.pro
ln -s $dfdir/screenrc $HOME/.screenrc ln -s $dfdir/screenrc $HOME/.screenrc
@ -19,16 +19,16 @@ ln -s $dfdir/tmux.conf $HOME/.tmux.conf
ln -s $dfdir/ledgerrc $HOME/.ledgerrc ln -s $dfdir/ledgerrc $HOME/.ledgerrc
ln -s $dfdir/toprc $HOME/.toprc ln -s $dfdir/toprc $HOME/.toprc
ln -s $dfdir/gitconfig $HOME/.gitconfig ln -s "$dfdir/gitconfig" "$HOME/.gitconfig"
ln -s $dfdir/irssi $HOME/.irssi ln -s "$dfdir/irssi" "$HOME/.irssi"
[ `uname -s` = "Linux" ] && ln -s $dfdir/Xdefaults $HOME/.Xdefaults [ `uname -s` = "Linux" ] && ln -s "$dfdir/Xdefaults" "$HOME/.Xdefaults"
touch $HOME/.hushlogin touch "$HOME/.hushlogin"
# Initialized submodules # Initialized submodules
cd $dfdir cd "$dfdir"
git submodule init git submodule init
git submodule update git submodule update