axzshctl: Look harder for themes in remote modules

[ax-zsh.git] / bin / axzshctl

diff --git a/bin/axzshctl b/bin/axzshctl
index cd463e3ded886e9f5b4ab08bed5925d00b8e9e22..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:
@@ -57,7 +57,7 @@ function Usage {
 function UpdatePluginCache {
        [[ -r "$AXZSH/cache" ]] || return 0
 
-       ax_msg - "Updating plugin cache ..."
+       [[ "$1" = "-v" ]] && ax_msg - "Updating plugin cache ..."
        rm -rf \
                $AXZSH/cache/zlogin.cache \
                $AXZSH/cache/zlogout.cache \
@@ -80,16 +80,16 @@ function NormalizedPluginName {
 
 function EnableAXZSH {
        for f (~/.zlogin ~/.zlogout ~/.zprofile ~/.zshrc); do
-               ln -sv "$AXZSH/ax.zsh" "$f" \
+               ln -s "$AXZSH/ax.zsh" "$f" \
                        || ax_error "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
+               if [[ -h "$f" ]]; then
+                       rm "$f" || ax_msg 2 "Failed to remove \"$f\"!"
+               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."
@@ -112,18 +112,19 @@ function EnablePlugin {
                if [[ ! -e "$AXZSH/repos/$plugin" ]]; then
                        ax_msg - "Cloning module from GitHub ..."
                        git clone --depth=1 "https://github.com/$1.git" \
-                        "$AXZSH/repos/$plugin"
+                        "$AXZSH/repos/$plugin" \
+                               || ax_error "Failed to clone repository!"
                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 1 "Module \"$1\" was enabled as theme \"${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
-               echo "Module \"$1\" will be enabled as plugin ..."
+               echo "Trying to enable \"$1\" as plugin ..."
        fi
 
        for dname (
@@ -138,11 +139,15 @@ function EnablePlugin {
        ); do
                [[ ! -d "$dname" ]] && continue
                mkdir -p "$dir"
-               (
+               if ! (
                        cd "$dir" || exit 9
-                       ln -sv "$dname" "$PWD"
-               )
-               return $?
+                       ln -s "$dname" "$PWD"
+               ); then
+                       ax_error "Failed to create link!"
+                       return 1
+               fi
+               ax_msg 0 "Plugin \"$plugin\" enabled."
+               return 0
        done
 
        ax_error "Plugin \"$1\" not found!"
@@ -203,11 +208,11 @@ function ResetPlugins {
 function EnableDefaultPlugins {
        local dir="$AXZSH/active_plugins"
 
-       ax_msg - "Activating (linking) default plugins ..."
+       ax_msg - "Activating default plugins ..."
        mkdir -p "$dir"
        (
                cd "$dir" || exit 9
-               ln -sfv "$AXZSH/default_plugins/"* "$PWD"
+               ln -sf "$AXZSH/default_plugins/"* "$PWD"
        )
        return $?
 }
@@ -215,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"
@@ -242,12 +258,13 @@ function SetTheme {
                                break
                        fi
                done
+
                if [[ -z "$theme" ]]; then
                        ax_error "Theme \"$1\" not found!"
                        return 1
                fi
        fi
-       ln -fsv "$theme" "$link_name" || return 1
+       ln -fs "$theme" "$link_name" || return 1
        return $?
 }
 
@@ -273,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"
@@ -414,7 +431,7 @@ case "$cmd" in
                ;;
        "update-caches")
                [[ $# -eq 0 ]] || Usage
-               UpdatePluginCache
+               UpdatePluginCache -v
                ;;
        "--help")
                Usage