X-Git-Url: https://arthur.barton.de/gitweb/?p=ax-zsh.git;a=blobdiff_plain;f=bin%2Faxzshctl;h=efc8a982f3d939f00ef8c13dc632c9067728046a;hp=32dd61a17577e83fd33f79faf33f235263eac478;hb=2ddebb388326d38d99b04303397ecadc185ccc58;hpb=1b3bf551cb606722ebd80a8693e377d4caaf2107

diff --git a/bin/axzshctl b/bin/axzshctl
index 32dd61a..efc8a98 100755
--- a/bin/axzshctl
+++ b/bin/axzshctl
@@ -1,7 +1,7 @@
 #!/usr/bin/env zsh
 #
 # AX-ZSH: Alex' Modular ZSH Configuration
-# Copyright (c) 2015-2017 Alexander Barton <alex@barton.de>
+# Copyright (c) 2015-2020 Alexander Barton <alex@barton.de>
 #
 
 # Include "ax-common.sh", if available:
@@ -15,6 +15,9 @@ if [[ -z "$ax_common_sourced" ]]; then
 		shift
 		echo "$@"
 	}
+	function ax_error {
+		ax_msg 2 "$@" >&2
+	}
 fi
 unset dir ax_common ax_common_sourced
 
@@ -48,13 +51,13 @@ function Usage {
 	echo "  update-caches"
 	echo "    Force rebuild of all cache files."
 	echo
-	exit 2
+	exit 0
 }
 
 function UpdatePluginCache {
 	[[ -r "$AXZSH/cache" ]] || return 0
 
-	ax_msg - "Updating plugin cache ..."
+	[[ "$1" = "-v" ]] && ax_msg - "Updating plugin cache ..."
 	rm -rf \
 		$AXZSH/cache/zlogin.cache \
 		$AXZSH/cache/zlogout.cache \
@@ -77,17 +80,17 @@ function NormalizedPluginName {
 
 function EnableAXZSH {
 	for f (~/.zlogin ~/.zlogout ~/.zprofile ~/.zshrc); do
-		ln -sv "$AXZSH/ax.zsh" "$f" \
-			|| ax_msg 2 "Failed to create symbolic link for \"$f\"!"
+		ln -s "$AXZSH/ax.zsh" "$f" \
+			|| ax_error "Failed to create symbolic link for \"$f\"!"
 	done
 }
 
 function DisableAXZSH {
 	for f (~/.zlogin ~/.zlogout ~/.zprofile ~/.zshrc); do
-		if [ -h "$f" ]; then
-			rm -v "$f" || ax_msg 2 "Failed to remove \"$f\"!"
-		elif [ -e "$f" ]; then
-			ax_msg 2 "Error: Not removing \"$f\", it is not a symbolic link!"
+		if [[ -h "$f" ]]; then
+			rm "$f" || ax_msg 2 "Failed to remove \"$f\"!"
+		elif [[ -e "$f" ]]; then
+			ax_error "Error: Not removing \"$f\", it is not a symbolic link!"
 		else
 			ax_msg 1 "Warning: \"$f\" already does not exist. Ok."
 		fi
@@ -107,14 +110,21 @@ function EnablePlugin {
 		# GitHub plugin
 		mkdir -p "$AXZSH/repos"
 		if [[ ! -e "$AXZSH/repos/$plugin" ]]; then
-			ax_msg - "Cloning plugin from GitHub ..."
-			git clone "https://github.com/$1.git" \
-			 "$AXZSH/repos/$plugin"
-			# Try to enable a theme in this "foreign" plugin, but
-			# ignore errors: we don't know if this plugin provides
-			# a theme at all ...
-			SetTheme "${plugin#*#}" 2>/dev/null
+			ax_msg - "Cloning module from GitHub ..."
+			git clone --depth=1 "https://github.com/$1.git" \
+			 "$AXZSH/repos/$plugin" \
+				|| ax_error "Failed to clone repository!"
+		fi
+		# Try to enable a theme in this "foreign module", but ignore
+		# errors: we don't know if this module provides a theme or is
+		# a "regular" plugin ...
+		if SetTheme "$plugin" 2>/dev/null; then
+			ax_msg 0 "Module \"$1\" was enabled as theme \"${plugin#*#}\"."
+			# A theme was enabled: So assume that this is a theme
+			# and don't enable it as plugin.
+			return 0
 		fi
+		echo "Trying to enable \"$1\" as plugin ..."
 	fi
 
 	for dname (
@@ -129,28 +139,47 @@ function EnablePlugin {
 	); do
 		[[ ! -d "$dname" ]] && continue
 		mkdir -p "$dir"
-		(
+		if ! (
 			cd "$dir" || exit 9
-			ln -sv "$dname" "$PWD"
-		)
-		return $?
+			ln -s "$dname" "$PWD"
+		); then
+			ax_error "Failed to create link!"
+			return 1
+		fi
+		ax_msg 0 "Plugin \"$plugin\" enabled."
+		return 0
 	done
 
-	ax_msg 2 "Plugin \"$1\" not found!"
+	ax_error "Plugin \"$1\" not found!"
 	return 1
 }
 
 function DisablePlugin {
 	local plugin=$(NormalizedPluginName "$1")
 	local dir="$AXZSH/active_plugins"
+	local r=-1
 
-	if [[ ! -h "$dir/$plugin" ]]; then
-		ax_msg 1 "Plugin \"$1\" not active?"
-		return 1
+	# Active theme?
+	if [[ $(readlink "$AXZSH/active_theme") = "$AXZSH/repos/$plugin/"* ]]; then
+		rm "$AXZSH/active_theme"; r=$?
+	fi
+
+	# Active plugin?
+	if [[ -h "$dir/$plugin" ]]; then
+		rm "$dir/$plugin"; r=$?
+	fi
+
+	if [[ $r -eq -1 ]]; then
+		ax_msg 1 "Plugin \"$1\" not active, nothing to do?"
+		r=1
+	fi
+
+	if [[ "$plugin" = *"#"* ]]; then
+		# Name matches a cloned repository, try to clean up!
+		echo "Cleaning up cloned repository ..."
+		rm -fr "$AXZSH/repos/$plugin"
 	fi
 
-	rm -v "$dir/$plugin"; r=$?
-	[ $r -eq 0 ] && rm -fr "$AXZSH/repos/$plugin"
 	return $r
 }
 
@@ -179,11 +208,11 @@ function ResetPlugins {
 function EnableDefaultPlugins {
 	local dir="$AXZSH/active_plugins"
 
-	ax_msg - "Activating (linking) default plugins ..."
+	ax_msg - "Activating default plugins ..."
 	mkdir -p "$dir"
 	(
 		cd "$dir" || exit 9
-		ln -sfv "$AXZSH/default_plugins/"* "$PWD"
+		ln -sf "$AXZSH/default_plugins/"* "$PWD"
 	)
 	return $?
 }
@@ -191,19 +220,30 @@ function EnableDefaultPlugins {
 function SetTheme {
 	local link_name="$AXZSH/active_theme"
 
-	if [ "$1" = "-" ]; then
+	if [[ "$1" = "-" ]]; then
 		rm -f "$link_name" || return 1
-		echo "Theme settings have been reset."
+		ax_msg 0 "Theme settings have been reset."
 		return 0
 	fi
 
-	if [ -r "$1" ]; then
+	if [[ -r "$1" ]]; then
 		theme="$1"
-	elif [ -r "$AXZSH/custom_themes/$1.axzshtheme" ]; then
+	elif [[ -r "$AXZSH/custom_themes/$1.axzshtheme" ]]; then
 		theme="$AXZSH/custom_themes/$1.axzshtheme"
-	elif [ -r "$AXZSH/themes/$1.axzshtheme" ]; then
+	elif [[ -r "$AXZSH/themes/$1.axzshtheme" ]]; then
 		theme="$AXZSH/themes/$1.axzshtheme"
 	else
+		# Look for theme in specific remote module:
+		for f (
+			"$AXZSH/repos/$1/"*.axzshtheme(N[1])
+			"$AXZSH/repos/$1/"*.zsh-theme(N[1])
+		); do
+			if [[ -r "$f" ]]; then
+				theme="$f"
+				break
+			fi
+		done
+
 		# Look for theme inside of installed plugins:
 		for dname (
 			"$AXZSH/custom_themes"
@@ -218,22 +258,23 @@ function SetTheme {
 				break
 			fi
 		done
+
 		if [[ -z "$theme" ]]; then
-			echo "Theme \"$1\" not found!"
+			ax_error "Theme \"$1\" not found!"
 			return 1
 		fi
 	fi
-	ln -fsv "$theme" "$link_name" || return 1
+	ln -fs "$theme" "$link_name" || return 1
 	return $?
 }
 
 function UpgradeAXZSH {
 	if [[ $+commands[git] -eq 0 ]]; then
-		ax_msg 2 "The git(1) command is not available!"
+		ax_error "The git(1) command is not available!"
 		return 1
 	fi
 	if [[ ! -d "$AXZSH/.git" ]]; then
-		ax_msg 2 "AX-ZSH seems not to be installed using Git. Can't upgrade!"
+		ax_error "AX-ZSH seems not to be installed using Git. Can't upgrade!"
 		return 1
 	fi
 
@@ -243,20 +284,20 @@ function UpgradeAXZSH {
 
 function UpgradeForeignPlugins {
 	if [[ $+commands[git] -eq 0 ]]; then
-		ax_msg 2 "The git(1) command is not available!"
+		ax_error "The git(1) command is not available!"
 		return 1
 	fi
 
 	for dir ($AXZSH/repos/*(N)); do
 		name=${dir:t:s/#/\//}
-		if [ -d "$dir/.git" ]; then
+		if [[ -d "$dir/.git" ]]; then
 			ax_msg - "Upgrading \"$name\" [git] ..."
 			(
 				cd "$dir"
-				git pull --ff-only || ax_msg 2 "Pull failed!"
+				git pull --ff-only || ax_error "Pull failed!"
 			)
 		else
-			ax_msg 2 "Unknown repository type!"
+			ax_error "Unknown repository type!"
 		fi
 	done
 }
@@ -329,7 +370,7 @@ NAME="$0:t"
 if [[ -z "$AXZSH" || ! -r "$AXZSH/ax.zsh" ]]; then
 	[[ -r "$HOME/.axzsh/ax.zsh" ]] && AXZSH="$HOME/.axzsh"
 	if [[ ! -r "$AXZSH/ax.zsh" ]]; then
-		ax_msg 2 "Oops, \"AXZSH\" is not set or invalid and can't be autodetected!"
+		ax_error "Oops, \"AXZSH\" is not set or invalid and can't be autodetected!"
 		exit 3
 	fi
 fi
@@ -380,7 +421,7 @@ case "$cmd" in
 		;;
 	"set-theme")
 		[[ $# -eq 1 ]] || Usage
-		SetTheme "$1" && UpdatePluginCache
+		SetTheme "$1"
 		;;
 	"upgrade")
 		[[ $# -eq 0 ]] || Usage
@@ -390,8 +431,13 @@ case "$cmd" in
 		;;
 	"update-caches")
 		[[ $# -eq 0 ]] || Usage
-		UpdatePluginCache
+		UpdatePluginCache -v
 		;;
-	*)
+	"--help")
 		Usage
+		;;
+	*)
+		ax_error "Invalid command \"$cmd\"!"
+		ax_error "Try \"$0 --help\" for more information."
+		exit 2
 esac