diff --git a/scripts/sync.sh b/scripts/sync.sh index 731616d..f8f70aa 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -1,4 +1,4 @@ -ABSPATH=$(cd "$(dirname "$0")/.."; pwd) +ABSPATH=$(\cd "$(dirname "$0")/.."; pwd) echo $ABSPATH while getopts ":hbsdpcw" VALUE "$@"; do if [ "$VALUE" = "h" ] ; then @@ -68,20 +68,20 @@ while getopts ":hbsdpcw" VALUE "$@"; do if command -v git 2>&1 >/dev/null; then if command -v zsh 2>&1 >/dev/null; then ln -s $ABSPATH/shells/zshrc ~/.zshrc - if [ ! -d ~/.antigen ] ; then - git clone https://github.com/zsh-users/antigen ~/.antigen - fi - # Install antigen bundles - zsh -c "source ~/.zshrc;exit" + for i in lpr oh-my-git-themes omg zsh-syntax-highlighting; do + if [ ! -d ~/.zsh-git/$i ]; then + git clone https://austenwares.com/gogs/stonewareslord/$i.git ~/.zsh-git/$i + else + \cd ~/.zsh-git/$i + git pull + \cd - + fi + done fi if [ ! -d ~/.fzf ] ; then git clone https://austenwares.com/gogs/stonewareslord/fzf.git ~/.fzf - else - \cd ~/.fzf - git pull origin master - \cd - + ~/.fzf/install -y fi - ~/.fzf/install -y else echo "No git! Not installing fzf or antigen" fi diff --git a/shells/zshrc b/shells/zshrc index 16016b3..6faab91 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -479,8 +479,8 @@ k(){ #alias aoeu='setxkbmap -layout us -option "' #alias asdf='setxkbmap -layout dvorak -option ""' #alias sudo='sudo -H' -source ~/zsh/lpr/liquidprompt -source ~/zsh/omg/base.sh -source ~/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -source ~/zsh/oh-my-git-themes/af-magic.zsh-theme +source ~/.zsh-git/lpr/liquidprompt +source ~/.zsh-git/omg/base.sh +source ~/.zsh-git/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +source ~/.zsh-git/oh-my-git-themes/af-magic.zsh-theme #zprof