axzshctl: Create shallow clones of remote modules

[ax-zsh.git] / bin / axzshctl

diff --git a/bin/axzshctl b/bin/axzshctl
index a75ebb3db750e0d483c1de6047bd4fd07d6ba3e4..5b2be804703606103721a44cedb0ded329d375a5 100755 (executable)
--- a/bin/axzshctl
+++ b/bin/axzshctl
@@ -10,7 +10,7 @@ for dir ("$HOME/lib" "$HOME/.ax" /usr/local /opt/ax /usr); do
        ax_common="${dir}/lib/ax/ax-common.sh"
        [[ -r "$ax_common" ]] && source "$ax_common"
 done
-if [[ -z "$ax_common_sourced" || axzsh_is_dumb_terminal ]]; then
+if [[ -z "$ax_common_sourced" ]]; then
        function ax_msg {
                shift
                echo "$@"
@@ -107,13 +107,18 @@ 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"
-                       # 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
+               # 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
 
@@ -191,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
@@ -212,6 +211,7 @@ function SetTheme {
        else
                # Look for theme inside of installed plugins:
                for dname (
+                       "$AXZSH/custom_themes"
                        "$AXZSH/custom_plugins/"*(N)
                        "$AXZSH/repos/"*(N)
                ); do
@@ -228,7 +228,7 @@ function SetTheme {
                        return 1
                fi
        fi
-       ln -sv "$theme" "$link_name" || return 1
+       ln -fsv "$theme" "$link_name" || return 1
        return $?
 }
 
@@ -377,8 +377,7 @@ case "$cmd" in
                ;;
        "enable-default-plugins")
                [[ $# -eq 0 ]] || Usage
-               EnableDefaultPlugins
-               UpdatePluginCache
+               EnableDefaultPlugins && UpdatePluginCache
                ;;
        "check-plugins")
                [[ $# -eq 0 ]] || Usage
@@ -387,7 +386,6 @@ case "$cmd" in
        "set-theme")
                [[ $# -eq 1 ]] || Usage
                SetTheme "$1"
-               UpdatePluginCache
                ;;
        "upgrade")
                [[ $# -eq 0 ]] || Usage