X-Git-Url: https://arthur.barton.de/gitweb/?p=ax-zsh.git;a=blobdiff_plain;f=install.sh;h=782e4cf761c3892adcdb38a11b283ff92231af69;hp=fc97abd1868c44c37939b5a13eaf49a697280aef;hb=2ddebb388326d38d99b04303397ecadc185ccc58;hpb=b3954b1506dedf7ddd2542f0f16fb40d91ae3899

diff --git a/install.sh b/install.sh
index fc97abd..782e4cf 100755
--- a/install.sh
+++ b/install.sh
@@ -5,9 +5,11 @@
 #
 
 # Include "ax-common.sh":
-for dir in "$HOME/lib" "$HOME/.ax" /usr/local /opt/ax /usr; do
+ax_common_sourced=
+for dir in "$HOME" "$HOME/.ax" /usr/local /opt/ax /usr; do
 	[ -z "$ax_common_sourced" ] || break
 	ax_common="${dir}/lib/ax/ax-common.sh"
+	# shellcheck source=/usr/local/lib/ax/ax-common.sh
 	[ -r "$ax_common" ] && . "$ax_common"
 done
 if [ -z "$ax_common_sourced" ]; then
@@ -19,7 +21,7 @@ fi
 unset dir ax_common ax_common_sourced
 
 safe_rm() {
-	if [ -f "$1" -a ! -L "$1" ]; then
+	if [ -f "$1" ] && [ ! -L "$1" ]; then
 		rm -f "$1.bak" || abort
 		mv -v "$1" "$1.bak" || abort
 	fi
@@ -38,12 +40,10 @@ export AXZSH
 
 S=$(dirname "$0")
 
-if [ "$S" = "$AXZSH" -o "$PWD" = "$AXZSH" ]; then
+if [ "$S" = "$AXZSH" ] || [ "$PWD" = "$AXZSH" ] || [ -L "$AXZSH" ]; then
 	ax_msg 1 "Initializing \"$AXZSH\":"
 else
 	ax_msg 1 "Install AX-ZSH into \"$AXZSH\":"
-
-	[ -L "$AXZSH" ] && rm -f "$AXZSH"
 	mkdir -p "$AXZSH" || abort
 
 	ax_msg - "Copying binaries and scripts ..."
@@ -64,8 +64,19 @@ else
 			cp -pR "$S/$p" "$AXZSH/$p" || abort
 		done
 	done
+
+	ax_msg - "Copying themes ..."
+	mkdir -p "$AXZSH/themes" || abort
+	for p in "$S/themes/"*; do
+		echo "$p -> $AXZSH/$p"
+		rm -fr "${AXZSH:?}/$p" || abort
+		cp -pR "$S/$p" "$AXZSH/$p" || abort
+	done
 fi
 
+mkdir -p "$AXZSH/custom_plugins" || abort
+mkdir -p "$AXZSH/custom_themes" || abort
+
 ax_msg - "Linking ZSH startup files ..."
 
 for f in ~/.zlogin ~/.zlogout ~/.zprofile ~/.zshrc; do
@@ -75,8 +86,7 @@ done
 
 if [ ! -d "$AXZSH/active_plugins" ]; then
 	ax_msg - "Initializing plugin directory \"$AXZSH/active_plugins\" ..."
-	which zsh >/dev/null 2>&1
-	if [ $? -eq 0 ]; then
+	if command -v zsh >/dev/null; then
 		zsh "$AXZSH/bin/axzshctl" reset-plugins || abort
 	else
 		ax_msg 1 "Oops, \"zsh\" not found!?"