From 6a3e7e793613b6d8926c2bdfbee65da6af5e36fc Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Thu, 26 Mar 2015 13:26:05 -0400 Subject: [PATCH] Create a Makefile for installation --- .gitignore | 3 ++- .gitmodules | 10 +++++----- .oh-my-zsh | 1 - .vim/bundle/vundle | 1 - Makefile | 24 ++++++++++++++++++++++++ .aliases => aliases | 0 .aliases-mac => aliases-mac | 0 .functions => functions | 0 .gemrc => gemrc | 0 .gitconfig => gitconfig | 0 .gitignore_global => gitignore_global | 0 oh-my-zsh | 1 + .tmux.1-8.conf => tmux.1-8.conf | 0 .tmux.1-9.conf => tmux.1-9.conf | 0 .tmux.conf => tmux.conf | 0 vim/bundle/vundle | 1 + {.vim => vim}/plugin/bclose.vim | 0 .vimrc => vimrc | 0 {.zsh => zsh}/atomaka.zsh-theme | 0 .zshrc => zshrc | 0 20 files changed, 33 insertions(+), 8 deletions(-) delete mode 160000 .oh-my-zsh delete mode 160000 .vim/bundle/vundle create mode 100644 Makefile rename .aliases => aliases (100%) rename .aliases-mac => aliases-mac (100%) rename .functions => functions (100%) rename .gemrc => gemrc (100%) rename .gitconfig => gitconfig (100%) rename .gitignore_global => gitignore_global (100%) create mode 160000 oh-my-zsh rename .tmux.1-8.conf => tmux.1-8.conf (100%) rename .tmux.1-9.conf => tmux.1-9.conf (100%) rename .tmux.conf => tmux.conf (100%) create mode 160000 vim/bundle/vundle rename {.vim => vim}/plugin/bclose.vim (100%) rename .vimrc => vimrc (100%) rename {.zsh => zsh}/atomaka.zsh-theme (100%) rename .zshrc => zshrc (100%) diff --git a/.gitignore b/.gitignore index 72e8ffc..15de6fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -* +oh-my-zsh/ +vim/ diff --git a/.gitmodules b/.gitmodules index 3052adf..f4e5e8f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule ".oh-my-zsh"] - path = .oh-my-zsh +[submodule "oh-my-zsh"] + path = oh-my-zsh url = https://github.com/robbyrussell/oh-my-zsh.git -[submodule ".vim/bundle/vundle"] - path = .vim/bundle/vundle - url = http://github.com/gmarik/vundle.git +[submodule "vim/bundle/vundle"] + path = vim/bundle/vundle + url = https://github.com/gmarik/vundle.git diff --git a/.oh-my-zsh b/.oh-my-zsh deleted file mode 160000 index c3eb548..0000000 --- a/.oh-my-zsh +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c3eb54839a070f447654ee6e6186343a1faa98e3 diff --git a/.vim/bundle/vundle b/.vim/bundle/vundle deleted file mode 160000 index 0b28e33..0000000 --- a/.vim/bundle/vundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b28e334e65b6628b0a61c412fcb45204a2f2bab diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..883f81c --- /dev/null +++ b/Makefile @@ -0,0 +1,24 @@ +excludes = -I Makefile -I README.md +symlinks = $(shell ls $(excludes) `pwd`) + +.PHONY: $(symlinks) + +all: install + +install: submodules $(symlinks) + +submodules: + git submodule update --init + +$(symlinks): + test -e `pwd`/$@ \ + && ln -sfn `pwd`/$@ ~/.$@ + +update: update-repo $(symlinks) + +update-repo: + git pull --rebase + git submodule update + +clean: + for file in $(symlinks); do rm ~/.$$file; done diff --git a/.aliases b/aliases similarity index 100% rename from .aliases rename to aliases diff --git a/.aliases-mac b/aliases-mac similarity index 100% rename from .aliases-mac rename to aliases-mac diff --git a/.functions b/functions similarity index 100% rename from .functions rename to functions diff --git a/.gemrc b/gemrc similarity index 100% rename from .gemrc rename to gemrc diff --git a/.gitconfig b/gitconfig similarity index 100% rename from .gitconfig rename to gitconfig diff --git a/.gitignore_global b/gitignore_global similarity index 100% rename from .gitignore_global rename to gitignore_global diff --git a/oh-my-zsh b/oh-my-zsh new file mode 160000 index 0000000..1b6af54 --- /dev/null +++ b/oh-my-zsh @@ -0,0 +1 @@ +Subproject commit 1b6af5467677a3c9414a7cc4bcd3b5ac61907ca1 diff --git a/.tmux.1-8.conf b/tmux.1-8.conf similarity index 100% rename from .tmux.1-8.conf rename to tmux.1-8.conf diff --git a/.tmux.1-9.conf b/tmux.1-9.conf similarity index 100% rename from .tmux.1-9.conf rename to tmux.1-9.conf diff --git a/.tmux.conf b/tmux.conf similarity index 100% rename from .tmux.conf rename to tmux.conf diff --git a/vim/bundle/vundle b/vim/bundle/vundle new file mode 160000 index 0000000..cfd3b2d --- /dev/null +++ b/vim/bundle/vundle @@ -0,0 +1 @@ +Subproject commit cfd3b2d388a8c2e9903d7a9d80a65539aabfe933 diff --git a/.vim/plugin/bclose.vim b/vim/plugin/bclose.vim similarity index 100% rename from .vim/plugin/bclose.vim rename to vim/plugin/bclose.vim diff --git a/.vimrc b/vimrc similarity index 100% rename from .vimrc rename to vimrc diff --git a/.zsh/atomaka.zsh-theme b/zsh/atomaka.zsh-theme similarity index 100% rename from .zsh/atomaka.zsh-theme rename to zsh/atomaka.zsh-theme diff --git a/.zshrc b/zshrc similarity index 100% rename from .zshrc rename to zshrc