aboutsummaryrefslogtreecommitdiff
path: root/README.markdown
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2014-03-02 00:21:56 +1300
committerTom Ryder <tom@sanctum.geek.nz>2014-03-02 00:21:56 +1300
commit8e4185c725852935944a74453c2ebc1de26f4f06 (patch)
tree4ec4150e1807e35cd84d246ad7dd06fc58752f21 /README.markdown
parentSimplify some command existence checks (diff)
downloaddotfiles-8e4185c725852935944a74453c2ebc1de26f4f06.tar.gz
dotfiles-8e4185c725852935944a74453c2ebc1de26f4f06.zip
Using Makefile-based install system
Just in an effort to use the right tool for the job. The new Makefile also makes more of an effort to remove and symlink files rather than whole directories, which means I shouldn't need stupid stuff in .gitignore anymore, so that's gone too.
Diffstat (limited to 'README.markdown')
-rw-r--r--README.markdown43
1 files changed, 19 insertions, 24 deletions
diff --git a/README.markdown b/README.markdown
index b8801dab..7b219fc0 100644
--- a/README.markdown
+++ b/README.markdown
@@ -64,36 +64,31 @@ the defaults.
Installation
------------
-There’s an installation script, but it’s pretty bare-bones, so don’t run it
-without reading it first. You’ll need to have a recent enough version of Git to
-support [submodules](http://git-scm.com/book/en/Git-Tools-Submodules) for this
-to work.
+The installation `Makefile` will delete things standing in the way of its
+symbolic links, so read the output of `make -n` first to make sure you aren’t
+going to lose anything unexpected.
-To install the core terminal-only files (ack, Bash, cURL, Git, Vim), use the
-following:
+You’ll need to have a recent enough version of Git to support
+[submodules](http://git-scm.com/book/en/Git-Tools-Submodules) for the Vim
+installation to work; it’s required for the plugin setup.
+
+To install the core terminal-only files (ack, Bash, cURL, Git, GnuPG, Vim), use
+the following:
```bash
-$ ~/.dotfiles/install
+$ make install
```
-You can add any combination of the following options to add configuration for
-other tools:
-
-* `-d` — `mysql(1)` and `psql(1)`
-* `-g` — GnuPG
-* `-m` — Mutt
-* `-n` — Ncmpcpp
-* `-r` — Newsbeuter
-* `-t` — tmux
-* `-w` — Wyrd
-* `-x` — X11
-
-The script will prompt you about replacing old files. If you’re brave/insane,
-you can pipe `yes(1)` into it to accept all the replacements:
+The remaining dotfiles can be installed with the other targets:
-```bash
-$ yes | ~/.dotfiles/install -dgmnrtwx
-```
+* `install-mutt`
+* `install-ncmcpp`
+* `install-newsbeuter`
+* `install-mysql`
+* `install-psql`
+* `install-tmux`
+* `install-wyrd`
+* `install-x`
Shell
-----