diff --git a/.zshrc2 b/.zshrc2 index 5b1a412..1c60625 100644 --- a/.zshrc2 +++ b/.zshrc2 @@ -42,12 +42,13 @@ fi source "$ANTIGEN" antigen use oh-my-zsh # enable plugins -antigen bundle git antigen bundle command-not-found -antigen bundle thefuck -antigen bundle fzf antigen bundle docker +antigen bundle extract +antigen bundle fzf +antigen bundle git antigen bundle ripgrep +antigen bundle thefuck antigen bundle tmux antigen bundle ufw antigen bundle z @@ -55,7 +56,7 @@ antigen bundle https://gitee.com/dictxiong/zsh-syntax-highlighting antigen bundle https://gitee.com/dictxiong/zsh-completions antigen bundle https://gitee.com/dictxiong/zsh-autosuggestions # select theme -antigen theme ys +antigen theme ${ZSH_THEME:-ys} # apply antigen apply # end of antigen config @@ -65,8 +66,17 @@ export DOTFILES=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd ) dfs() { case $1 in - update ) (cd "$DOTFILES" && env git pull) ;; - * ) echo "unknown command \"$1\". available: update" ;; + update ) (cd "$DOTFILES" && git pull) ;; + reset ) + antigen reset 1> /dev/null + rm -rf $HOME/.antigen + $DOTFILES/install.sh -r + dfs update + $DOTFILES/install.sh -i + echo 'Done. Please open a new shell to see the changes.' + ;; + cd ) cd "$DOTFILES" ;; + * ) echo "unknown command \"$1\". available: update, reset, cd" ;; esac } diff --git a/install.sh b/install.sh index 2ab8d17..2b3ec43 100755 --- a/install.sh +++ b/install.sh @@ -141,6 +141,9 @@ create_symlink() return 1 fi if [ -f "$dest" ]; then + if [ "$(readlink $dest)" -ef "$src" ]; then + return 0 + fi fmt_warning "\"$dest\" already exists! stat output:" echo ---------- stat $dest @@ -154,6 +157,7 @@ create_symlink() fi fi ln -s $src $dest + return $? } delete_link_if_match()