diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | deploy.sh | 25 | ||||
| -rwxr-xr-x | diff.sh | 16 | ||||
| -rw-r--r-- | gitconfig (renamed from gitconfig.template) | 4 |
4 files changed, 11 insertions, 36 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bae75a5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +vim/doc/tags +dotfiles-backup @@ -2,25 +2,14 @@ set -e -# template git profile -echo "enter your global git user name:" -read name -echo "enter your global git e-mail:" -read email - -sed -e "s|#NAME#|$name|" -e "s|#EMAIL#|$email|" gitconfig.template > gitconfig +rm -rf dotfiles-backup +mkdir -p dotfiles-backup # deploy -for f in vimrc gvimrc gitconfig gitignore zshrc +for f in vimrc gvimrc gitconfig gitignore zshrc zsh vim do - cp $f ~/.${f} + if [ -e ~/.${f} ]; then + mv ~/.${f} dotfiles-backup/${f} + fi + ln -s `pwd`/${f} ~/.${f} done - -mkdir -p ~/.zsh -cp zsh/* ~/.zsh - -mkdir -p ~/.vim -cp -r vim/* ~/.vim - -# clean-up -rm gitconfig diff --git a/diff.sh b/diff.sh deleted file mode 100755 index ffb780b..0000000 --- a/diff.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -diff -U 0 vimrc ~/.vimrc -echo -diff -U 0 gvimrc ~/.gvimrc -echo -diff -U 0 gitconfig.template ~/.gitconfig -echo -diff -U 0 gitignore ~/.gitignore -echo -diff -U 0 zshrc ~/.zshrc -echo -diff -U 0 zsh ~/.zsh - -echo -diff -r -U 0 -x "tags" -x ".netrwhist" vim ~/.vim diff --git a/gitconfig.template b/gitconfig index 8a783c9..b17af33 100644 --- a/gitconfig.template +++ b/gitconfig @@ -1,6 +1,6 @@ [user] - name = #NAME# - email = #EMAIL# + name = Matt Singleton + email = matthew.j.singleton@gmail.com [alias] st = status |