X-Git-Url: https://arthur.barton.de/gitweb/?p=ax-zsh.git;a=blobdiff_plain;f=bin%2Faxzshctl;h=a75ebb3db750e0d483c1de6047bd4fd07d6ba3e4;hp=d2216bbe566d01df133d5376f8df7a3d220abafa;hb=15f0cf1b5813fb6b9159d71edcfcba952d57eecb;hpb=8d916b9f62509cd4d2408a1e59c3319f71cc6489

diff --git a/bin/axzshctl b/bin/axzshctl
index d2216bb..a75ebb3 100755
--- a/bin/axzshctl
+++ b/bin/axzshctl
@@ -1,7 +1,7 @@
 #!/usr/bin/env zsh
 #
 # AX-ZSH: Alex' Modular ZSH Configuration
-# Copyright (c) 2015-2016 Alexander Barton <alex@barton.de>
+# Copyright (c) 2015-2017 Alexander Barton <alex@barton.de>
 #
 
 # Include "ax-common.sh", if available:
@@ -10,7 +10,7 @@ for dir ("$HOME/lib" "$HOME/.ax" /usr/local /opt/ax /usr); do
 	ax_common="${dir}/lib/ax/ax-common.sh"
 	[[ -r "$ax_common" ]] && source "$ax_common"
 done
-if [[ -z "$ax_common_sourced" ]]; then
+if [[ -z "$ax_common_sourced" || axzsh_is_dumb_terminal ]]; then
 	function ax_msg {
 		shift
 		echo "$@"
@@ -23,22 +23,20 @@ function Usage {
 	echo
 	echo "  enable"
 	echo "    Enable AX-ZSH altogether."
-	echo
 	echo "  disable"
 	echo "    Disable AX-ZSH altogether."
 	echo
 	echo "  enable-plugin <name|directory> [<name|directory> [...]]"
 	echo "    Enable plugin(s)."
-	echo
 	echo "  disable-plugin <name> [<name> [...]]"
 	echo "    Disable plugin(s)."
+	echo "  list-enabled"
+	echo "    List enabled plugins."
 	echo
 	echo "  reset-plugins"
 	echo "    Reset active plugins to the default set."
-	echo
 	echo "  enable-default-plugins"
 	echo "    Enable all default plugins."
-	echo
 	echo "  check-plugins"
 	echo "    Detect plugins which are \"useful\" on this system."
 	echo
@@ -47,15 +45,31 @@ function Usage {
 	echo
 	echo "  upgrade"
 	echo "    Upgrade AX-ZSH installation (requires Git)."
+	echo "  update-caches"
+	echo "    Force rebuild of all cache files."
 	echo
 	exit 2
 }
 
+function UpdatePluginCache {
+	[[ -r "$AXZSH/cache" ]] || return 0
+
+	ax_msg - "Updating plugin cache ..."
+	rm -rf \
+		$AXZSH/cache/zlogin.cache \
+		$AXZSH/cache/zlogout.cache \
+		$AXZSH/cache/zprofile.cache \
+		$AXZSH/cache/zshrc.cache \
+		|| return 1
+	echo "Regenerating cache files ..."
+	zsh -ilc '' >/dev/null
+}
+
 function NormalizedPluginName {
 	if [[ "$1" =~ "^[[:alnum:]-]+/[[:alnum:]_-]+$" ]]; then
-		echo "$1" | sed -e 's|/|#|g'
+		echo "${1:gs/\//#}"
 	elif [[ "$1" =~ "/" ]]; then
-		basename "$1"
+		echo "${1:t}"
 	else
 		echo "$1"
 	fi
@@ -96,6 +110,10 @@ function EnablePlugin {
 			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
 		fi
 	fi
 
@@ -136,6 +154,13 @@ function DisablePlugin {
 	return $r
 }
 
+function ListEnabledPlugins {
+	for plugin ($AXZSH/active_plugins/*(N)); do
+		print ${plugin:t:s/#/\//}
+	done
+	return 0
+}
+
 function ResetPlugins {
 	local dir="$AXZSH/active_plugins"
 	local r1=0, r2=0
@@ -185,8 +210,23 @@ function SetTheme {
 	elif [ -r "$AXZSH/themes/$1.axzshtheme" ]; then
 		theme="$AXZSH/themes/$1.axzshtheme"
 	else
-		echo "Theme \"$1\" not found!"
-		return 1
+		# Look for theme inside of installed plugins:
+		for dname (
+			"$AXZSH/custom_plugins/"*(N)
+			"$AXZSH/repos/"*(N)
+		); do
+			if [[ -r "$dname/$1.axzshtheme" ]]; then
+				theme="$dname/$1.axzshtheme"
+				break
+			elif [[ -r "$dname/$1.zsh-theme" ]]; then
+				theme="$dname/$1.zsh-theme"
+				break
+			fi
+		done
+		if [[ -z "$theme" ]]; then
+			echo "Theme \"$1\" not found!"
+			return 1
+		fi
 	fi
 	ln -sv "$theme" "$link_name" || return 1
 	return $?
@@ -213,7 +253,7 @@ function UpgradeForeignPlugins {
 	fi
 
 	for dir ($AXZSH/repos/*(N)); do
-		name=$(basename "$dir" | sed -e 's|#|/|g')
+		name=${dir:t:s/#/\//}
 		if [ -d "$dir/.git" ]; then
 			ax_msg - "Upgrading \"$name\" [git] ..."
 			(
@@ -232,7 +272,7 @@ function CheckPlugins {
 
 	ax_msg - "Checking plugins ..."
 	for dir ($AXZSH/plugins/*(N)); do
-		plugin=$(basename "$dir")
+		plugin=${dir:t}
 
 		# Test if plugin is already enabled
 		[[ -e "$AXZSH/active_plugins/$plugin" ]] \
@@ -244,7 +284,7 @@ function CheckPlugins {
 		new_plugin=""
 		for script ($AXZSH/plugins/$plugin/$plugin.{zshrc,zprofile}); do
 			[[ -r "$script" ]] || continue
-			zsh -i -c "AXZSH_PLUGIN_CHECK=1 source $script"; r=$?
+			AXZSH_PLUGIN_CHECK=1 zsh -i -c "source $script"; r=$?
 			if [[ $r -eq 0 ]]; then
 				new_plugin=$plugin
 				break
@@ -316,21 +356,29 @@ case "$cmd" in
 		for plugin in "$@"; do
 			EnablePlugin "$plugin"
 		done
+		UpdatePluginCache
 		;;
 	"disable-plugin")
 		[[ $# -gt 0 ]] || Usage
 		for plugin in "$@"; do
 			DisablePlugin "$plugin"
 		done
+		UpdatePluginCache
+		;;
+	"list-enabled")
+		[[ $# -eq 0 ]] || Usage
+		ListEnabledPlugins
 		;;
 	"reset-plugins")
 		[[ $# -eq 0 ]] || Usage
 		ResetPlugins
 		EnableDefaultPlugins
+		UpdatePluginCache
 		;;
 	"enable-default-plugins")
 		[[ $# -eq 0 ]] || Usage
 		EnableDefaultPlugins
+		UpdatePluginCache
 		;;
 	"check-plugins")
 		[[ $# -eq 0 ]] || Usage
@@ -339,11 +387,17 @@ case "$cmd" in
 	"set-theme")
 		[[ $# -eq 1 ]] || Usage
 		SetTheme "$1"
+		UpdatePluginCache
 		;;
 	"upgrade")
 		[[ $# -eq 0 ]] || Usage
 		UpgradeAXZSH
 		UpgradeForeignPlugins
+		UpdatePluginCache
+		;;
+	"update-caches")
+		[[ $# -eq 0 ]] || Usage
+		UpdatePluginCache
 		;;
 	*)
 		Usage