40_path: Look for Linuxbrew

[ax-zsh.git] / bin / axzshctl

diff --git a/bin/axzshctl b/bin/axzshctl
index ed5b637c7cd6a611ebe146f72d7bbaee02766c0e..70c9affe94a8e3783003aa7de8dd30d559ae9cd2 100755 (executable)
--- 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/\//#}"
@@ -94,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
 
@@ -190,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 $?
@@ -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
@@ -347,12 +385,17 @@ case "$cmd" in
                ;;
        "set-theme")
                [[ $# -eq 1 ]] || Usage
-               SetTheme "$1"
+               SetTheme "$1" && UpdatePluginCache
                ;;
        "upgrade")
                [[ $# -eq 0 ]] || Usage
                UpgradeAXZSH
                UpgradeForeignPlugins
+               UpdatePluginCache
+               ;;
+       "update-caches")
+               [[ $# -eq 0 ]] || Usage
+               UpdatePluginCache
                ;;
        *)
                Usage