From 66db631cb8cced7be5fe13e7e3bc1617e9d38419 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 9 Apr 2014 11:45:52 -0700 Subject: [PATCH] Fix bootstrop symlinking --- bootstrap.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index f46bf606..a6f5d702 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -10,16 +10,19 @@ DOTFILES_DIRECTORY="$(dirname "${BASH_SOURCE}" | xargs ${readlink_command} -f)/d function symlink_dotfiles() { cd $DOTFILES_DIRECTORY - [[ -a ~/.dotfiles-backups ]] && mv ~/.dotfiles-backups ~/.dotfiles-backups.old + [ -a ~/.dotfiles-backups ] && mv ~/.dotfiles-backups ~/.dotfiles-backups.old mkdir ~/.dotfiles-backups for filename in *; do local link_destination="$HOME/.$filename" - local absolute_path="$(${readlink_command} -f $filename)" - echo "linking $link_destination to $absolute_path" - [[ -a $link_destination ]] && mv $link_destination ~/.dotfiles-backups - ln -si $absolute_path $link_destination + local link_target=$(${readlink_command} -f $filename) + echo "linking $link_destination to $link_target" + # Using only test -e doesn't work here because it will return + # false if the destination of the symbolic link at + # link_destination does not exist. + test -e $link_destination || test -L $link_destination && mv $link_destination ~/.dotfiles-backups + ln -si $link_target $link_destination done - [[ -a ~/.dotfiles-backups ]] && mv ~/.dotfiles-backups.old ~/.dotfiles-backups/.dotfiles-backups + [ -a ~/.dotfiles-backups.old ] && mv ~/.dotfiles-backups.old ~/.dotfiles-backups/.dotfiles-backups } if [ "$1" = "--force" -o "$1" = "-f" ]; then