From a97feda41526dcdbd1d261f1b46ec2f162a02848 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Sat, 12 Sep 2015 20:06:46 +0200 Subject: [PATCH] install.sh: Really copy files or setup existing ~/.axzsh directory Don't symlink ~/.axzsh to some other location. --- install.sh | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 0c50964..26ec741 100755 --- a/install.sh +++ b/install.sh @@ -31,10 +31,37 @@ umask 027 [ -n "$AXZSH" ] || AXZSH="$HOME/.axzsh" export AXZSH -ax_msg - "Installing AX-ZSH into \"$AXZSH\" ..." +S=$(dirname "$0") -safe_rm "$AXZSH" || exit 1 -ln -sv "$PWD" "$AXZSH" || exit 1 +if [ "$S" = "$AXZSH" -o "$PWD" = "$AXZSH" ]; then + ax_msg 1 "Initializing \"$AXZSH\":" +else + ax_msg 1 "Install AX-ZSH into \"$AXZSH\":" + + [ -L "$AXZSH" ] && rm -f "$AXZSH" + mkdir -p "$AXZSH" || exit 1 + + ax_msg - "Copying binaries and scripts ..." + cp -pRv "$S/ax.zsh"* "$AXZSH/" || exit 1 + mkdir -p "$AXZSH/bin" || exit 1 + cp -pRv "$S/bin/"* "$AXZSH/bin/" || exit 1 + + for f in AUTHORS LICENSE.md README.md; do + cp -pRv "$S/$f" "$AXZSH/" || exit 1 + done + + ax_msg - "Copying plugins ..." + for plugin_type in core default_plugins plugins; do + mkdir -p "$AXZSH/$plugin_type" || exit 1 + for p in "$S/$plugin_type/"*; do + echo "$p -> $AXZSH/$p" + rm -fr "${AXZSH:?}/$p" || exit 1 + cp -pR "$S/$p" "$AXZSH/$p" || exit 1 + done + done +fi + +ax_msg - "Linking ZSH startup files ..." for f in ~/.zlogin ~/.zlogout ~/.zprofile ~/.zshrc; do safe_rm "$f" || exit 1 -- 2.39.2