X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=bin%2Faxzshctl;h=64402bf70fed2d3bc03e2a79c83448463ed3c7ab;hb=480f75c3ff4dafd4ba729eacae723d38dc84f4ca;hp=9d5eff027a2dc60f9ae31b75c8a839eaed48de24;hpb=83843f3df40a4437abf47da1de36955346987d2c;p=ax-zsh.git

diff --git a/bin/axzshctl b/bin/axzshctl
index 9d5eff0..64402bf 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:
@@ -21,18 +21,22 @@ unset dir ax_common ax_common_sourced
 function Usage {
 	echo "Usage: $NAME <command> [...]"
 	echo
+	echo "  enable"
+	echo "    Enable AX-ZSH altogether."
+	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
@@ -45,16 +49,49 @@ function Usage {
 	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
 }
 
+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\"!"
+	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!"
+		else
+			ax_msg 1 "Warning: \"$f\" already does not exist. Ok."
+		fi
+	done
+}
+
 function EnablePlugin {
 	local plugin=$(NormalizedPluginName "$1")
 	local dir="$AXZSH/active_plugins"
@@ -111,6 +148,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
@@ -188,7 +232,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] ..."
 			(
@@ -207,7 +251,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" ]] \
@@ -219,7 +263,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
@@ -266,35 +310,54 @@ NAME="$0:t"
 
 [[ $# -gt 0 ]] || Usage
 
-if [[ -z "$AXZSH" || ! -d "$AXZSH" ]]; then
-	ax_msg 2 "Oops, \"AXZSH\" is not set or invalid!"
-	exit 3
+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!"
+		exit 3
+	fi
 fi
 
 cmd="$1"
 shift
 
 case "$cmd" in
+	"enable")
+		[[ $# -eq 0 ]] || Usage
+		EnableAXZSH
+		;;
+	"disable")
+		[[ $# -eq 0 ]] || Usage
+		DisableAXZSH
+		;;
 	"enable-plugin")
 		[[ $# -gt 0 ]] || Usage
 		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
@@ -303,11 +366,13 @@ case "$cmd" in
 	"set-theme")
 		[[ $# -eq 1 ]] || Usage
 		SetTheme "$1"
+		UpdatePluginCache
 		;;
 	"upgrade")
 		[[ $# -eq 0 ]] || Usage
 		UpgradeAXZSH
 		UpgradeForeignPlugins
+		UpdatePluginCache
 		;;
 	*)
 		Usage