aboutsummaryrefslogtreecommitdiff
path: root/install
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2012-09-09 16:12:19 +1200
committerTom Ryder <tom@sanctum.geek.nz>2012-09-09 16:12:19 +1200
commite1e2204ec077ed5ba1767535e82709ef51d3b249 (patch)
tree59ef1eb09bf3edafe30959ea070ecfaf98ab3aae /install
parentChanged my mind (diff)
downloaddotfiles-e1e2204ec077ed5ba1767535e82709ef51d3b249.tar.gz
dotfiles-e1e2204ec077ed5ba1767535e82709ef51d3b249.zip
Update install script
Diffstat (limited to 'install')
-rwxr-xr-xinstall15
1 files changed, 11 insertions, 4 deletions
diff --git a/install b/install
index 65c3ddfa..b8cdc634 100755
--- a/install
+++ b/install
@@ -14,10 +14,6 @@ ln -fs ".dotfiles/readline/inputrc" "${HOME}/.inputrc"
ln -fs ".dotfiles/tmux/tmux.conf" "${HOME}/.tmux.conf"
ln -fs ".dotfiles/vim/vimrc" "${HOME}/.vimrc"
ln -fs ".dotfiles/vim/gvimrc" "${HOME}/.gvimrc"
-ln -fs ".dotfiles/X/Xmodmap" "${HOME}/.Xmodmap"
-ln -fs ".dotfiles/X/Xresources" "${HOME}/.Xresources"
-ln -fs ".dotfiles/X/xsession" "${HOME}/.xsession"
-ln -fs ".dotfiles/X/xsessionrc" "${HOME}/.xsessionrc"
# Link in directories, removing whatever's already there first.
[[ -e "${HOME}/.vim" ]] && rm -r "${HOME}/.vim"
@@ -25,3 +21,14 @@ ln -fs ".dotfiles/vim" "${HOME}/.vim"
[[ -e "${HOME}/.terminfo" ]] && rm -r "${HOME}/.terminfo"
ln -fs ".dotfiles/terminfo" "${HOME}/.terminfo"
+# Optionally link in X and Awesome stuff.
+if [[ $1 == "-X" ]]; then
+ ln -fs ".dotfiles/X/Xmodmap" "${HOME}/.Xmodmap"
+ ln -fs ".dotfiles/X/Xresources" "${HOME}/.Xresources"
+ ln -fs ".dotfiles/X/xsession" "${HOME}/.xsession"
+ ln -fs ".dotfiles/X/xsessionrc" "${HOME}/.xsessionrc"
+ mkdir -p "${HOME}/.config"
+ [[ -e "${HOME}/.config/awesome" ]] && rm -r "${HOME}/.config/awesome"
+ ln -fs "../.dotfiles/awesome" "${HOME}/.config/awesom"
+fi
+