From 58263cb458bc7ad9b123173f81f0912f341a702c Mon Sep 17 00:00:00 2001
From: gxlin <iigxlin@gmail.com>
Date: Fri, 16 Jul 2021 10:14:10 +0800
Subject: Bug fix in bootstrap.sh

---
 .zshrc       | 4 ++--
 bootstrap.sh | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.zshrc b/.zshrc
index dd9ce52..03a77ec 100644
--- a/.zshrc
+++ b/.zshrc
@@ -18,7 +18,7 @@ HISTSIZE=1000
 SAVEHIST=1000
 HISTFILE=~/.zsh_history
 
-[ -d ~/.dotfiles/bin ] && export PATH="$HOME/.dotfiles/bin:$PATH"
+[ -d ~/bin ] && export PATH="$HOME/bin:$PATH"
 
 [[ -s /etc/profile.d/autojump.sh ]] && source /etc/profile.d/autojump.sh
 
@@ -67,4 +67,4 @@ if ! zplug check --verbose; then
 fi
 zplug load
 
-source $HOME/.dotfiles/.aliases
+source $HOME/.aliases
diff --git a/bootstrap.sh b/bootstrap.sh
index f0876f9..3d44bee 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -7,16 +7,17 @@ remove_and_link () {
     do
         if [ -L $HOME/$var ] && [ -e $HOME/$var ] && \
             [ "$(readlink -- $HOME/$var)" = "$dotfiles_dir/$var" ]; then
-            return
+            continue
         fi
 
         rm -rf $HOME/$var
         ln -s $dotfiles_dir/$var $HOME/$var
+        echo "Linked: $HOME/$var -> $dotfiles_dir/$var"
     done
 }
 
 link_all () {
-    remove_and_link .ctags.d .mutt bin .alias .macos \
+    remove_and_link .ctags.d .mutt bin .aliases .macos \
         .mbsyncrc .msmtprc  .tmux.conf .urlview .zshrc \
         .vimrc .vim
 }
-- 
cgit v1.2.3