X-Git-Url: https://arthur.barton.de/gitweb/?p=ax-zsh.git;a=blobdiff_plain;f=bin%2Faxzshctl;h=5b2be804703606103721a44cedb0ded329d375a5;hp=ed5b637c7cd6a611ebe146f72d7bbaee02766c0e;hb=8eea5840d8c5fc594764e37664effe592b4f18c5;hpb=9f98ff0460cec402504eec1311849b9506063289

diff --git a/bin/axzshctl b/bin/axzshctl
index ed5b637..5b2be80 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:
@@ -45,10 +45,26 @@ 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:gs/\//#}"
@@ -91,10 +107,19 @@ 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" \
+			ax_msg - "Cloning module from GitHub ..."
+			git clone --depth=1 "https://github.com/$1.git" \
 			 "$AXZSH/repos/$plugin"
 		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
 	fi
 
 	for dname (
@@ -171,14 +196,8 @@ function EnableDefaultPlugins {
 function SetTheme {
 	local link_name="$AXZSH/active_theme"
 
-	if [ $# -ne 1 ]; then
-		echo "Usage: axzsh_set_theme <name|->"
-		return 1
-	fi
-
-	rm -f "$link_name" || return 1
-
 	if [ "$1" = "-" ]; then
+		rm -f "$link_name" || return 1
 		echo "Theme settings have been reset."
 		return 0
 	fi
@@ -190,10 +209,26 @@ 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_themes"
+			"$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
+	ln -fsv "$theme" "$link_name" || return 1
 	return $?
 }
 
@@ -321,12 +356,14 @@ 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
@@ -336,10 +373,11 @@ case "$cmd" in
 		[[ $# -eq 0 ]] || Usage
 		ResetPlugins
 		EnableDefaultPlugins
+		UpdatePluginCache
 		;;
 	"enable-default-plugins")
 		[[ $# -eq 0 ]] || Usage
-		EnableDefaultPlugins
+		EnableDefaultPlugins && UpdatePluginCache
 		;;
 	"check-plugins")
 		[[ $# -eq 0 ]] || Usage
@@ -353,6 +391,11 @@ case "$cmd" in
 		[[ $# -eq 0 ]] || Usage
 		UpgradeAXZSH
 		UpgradeForeignPlugins
+		UpdatePluginCache
+		;;
+	"update-caches")
+		[[ $# -eq 0 ]] || Usage
+		UpdatePluginCache
 		;;
 	*)
 		Usage