diff --git a/.README.md b/.README.md index de7b4f2..ac4f138 100644 --- a/.README.md +++ b/.README.md @@ -13,25 +13,24 @@ dotfiles config --local status.showUntrackedFiles no ## Install onto a new system -``` -alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME' - -echo ".dotfiles" >> .gitignore -git clone --bare $HOME/.dotfiles -dotfiles checkout -dotfiles config --local status.showUntrackedFiles no -``` - -The step above might fail with a message. +The `checkout` command is expected to fail with a message. This is because your $HOME folder might already have some stock configuration files which would be overwritten by Git. -I provide you with a possible rough shortcut to move all the offending files +The “BKDIR” part is a rough shortcut to move all the offending files automatically to a backup folder: ``` -mkdir -p .dotfiles-backup -dotfiles checkout 2>&1 | egrep "\s+\." | awk {'print $1'} | \ -xargs -I{} mv {} .dotfiles-backup/{} +git clone --bare $HOME/.dotfiles + +alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME' + +dotfiles config --local status.showUntrackedFiles no + +BKDIR=".dotfiles-backup/"; +dotfiles checkout 2>&1 | egrep "\s+" | awk {'print $1'} | + xargs -I{} sh -c "mkdir -p \$(dirname ${BKDIR}{}); mv -iv {} ${BKDIR}{}"; + +dotfiles checkout ``` ## Other Tools