axzshctl: Look harder for themes in remote modules

[ax-zsh.git] / bin / axzshctl

diff --git a/bin/axzshctl b/bin/axzshctl
index 4feade120037cebd602eb28ec925f0a8f37eee20..efc8a982f3d939f00ef8c13dc632c9067728046a 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-2017 Alexander Barton <alex@barton.de>
+# Copyright (c) 2015-2020 Alexander Barton <alex@barton.de>
 #
 
 # Include "ax-common.sh", if available:
@@ -87,9 +87,9 @@ function EnableAXZSH {
 
 function DisableAXZSH {
        for f (~/.zlogin ~/.zlogout ~/.zprofile ~/.zshrc); do
-               if [ -h "$f" ]; then
+               if [[ -h "$f" ]]; then
                        rm "$f" || ax_msg 2 "Failed to remove \"$f\"!"
-               elif [ -e "$f" ]; then
+               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."
@@ -118,7 +118,7 @@ function EnablePlugin {
                # 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
+               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.
@@ -220,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
                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"
@@ -247,6 +258,7 @@ function SetTheme {
                                break
                        fi
                done
+
                if [[ -z "$theme" ]]; then
                        ax_error "Theme \"$1\" not found!"
                        return 1
@@ -278,7 +290,7 @@ function UpgradeForeignPlugins {
 
        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"