axzshctl: Handle themes on "disable-plugin" & clean up repositories

[ax-zsh.git] / bin / axzshctl

diff --git a/bin/axzshctl b/bin/axzshctl
index 70c9affe94a8e3783003aa7de8dd30d559ae9cd2..cd463e3ded886e9f5b4ab08bed5925d00b8e9e22 100755 (executable)
--- a/bin/axzshctl
+++ b/bin/axzshctl
@@ -15,6 +15,9 @@ if [[ -z "$ax_common_sourced" ]]; then
                shift
                echo "$@"
        }
+       function ax_error {
+               ax_msg 2 "$@" >&2
+       }
 fi
 unset dir ax_common ax_common_sourced
 
@@ -48,7 +51,7 @@ function Usage {
        echo "  update-caches"
        echo "    Force rebuild of all cache files."
        echo
-       exit 2
+       exit 0
 }
 
 function UpdatePluginCache {
@@ -78,7 +81,7 @@ function NormalizedPluginName {
 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\"!"
+                       || ax_error "Failed to create symbolic link for \"$f\"!"
        done
 }
 
@@ -87,7 +90,7 @@ function DisableAXZSH {
                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!"
+                       ax_error "Error: Not removing \"$f\", it is not a symbolic link!"
                else
                        ax_msg 1 "Warning: \"$f\" already does not exist. Ok."
                fi
@@ -107,14 +110,20 @@ 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 1 "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 ..."
        fi
 
        for dname (
@@ -136,21 +145,36 @@ function EnablePlugin {
                return $?
        done
 
-       ax_msg 2 "Plugin \"$1\" not found!"
+       ax_error "Plugin \"$1\" not found!"
        return 1
 }
 
 function DisablePlugin {
        local plugin=$(NormalizedPluginName "$1")
        local dir="$AXZSH/active_plugins"
+       local r=-1
 
-       if [[ ! -h "$dir/$plugin" ]]; then
-               ax_msg 1 "Plugin \"$1\" not active?"
-               return 1
+       # Active theme?
+       if [[ $(readlink "$AXZSH/active_theme") = "$AXZSH/repos/$plugin/"* ]]; then
+               rm "$AXZSH/active_theme"; r=$?
+       fi
+
+       # Active plugin?
+       if [[ -h "$dir/$plugin" ]]; then
+               rm "$dir/$plugin"; r=$?
+       fi
+
+       if [[ $r -eq -1 ]]; then
+               ax_msg 1 "Plugin \"$1\" not active, nothing to do?"
+               r=1
+       fi
+
+       if [[ "$plugin" = *"#"* ]]; then
+               # Name matches a cloned repository, try to clean up!
+               echo "Cleaning up cloned repository ..."
+               rm -fr "$AXZSH/repos/$plugin"
        fi
 
-       rm -v "$dir/$plugin"; r=$?
-       [ $r -eq 0 ] && rm -fr "$AXZSH/repos/$plugin"
        return $r
 }
 
@@ -191,15 +215,9 @@ 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
-               echo "Theme settings have been reset."
+               rm -f "$link_name" || return 1
+               ax_msg 0 "Theme settings have been reset."
                return 0
        fi
 
@@ -212,6 +230,7 @@ function SetTheme {
        else
                # Look for theme inside of installed plugins:
                for dname (
+                       "$AXZSH/custom_themes"
                        "$AXZSH/custom_plugins/"*(N)
                        "$AXZSH/repos/"*(N)
                ); do
@@ -224,21 +243,21 @@ function SetTheme {
                        fi
                done
                if [[ -z "$theme" ]]; then
-                       echo "Theme \"$1\" not found!"
+                       ax_error "Theme \"$1\" not found!"
                        return 1
                fi
        fi
-       ln -sv "$theme" "$link_name" || return 1
+       ln -fsv "$theme" "$link_name" || return 1
        return $?
 }
 
 function UpgradeAXZSH {
        if [[ $+commands[git] -eq 0 ]]; then
-               ax_msg 2 "The git(1) command is not available!"
+               ax_error "The git(1) command is not available!"
                return 1
        fi
        if [[ ! -d "$AXZSH/.git" ]]; then
-               ax_msg 2 "AX-ZSH seems not to be installed using Git. Can't upgrade!"
+               ax_error "AX-ZSH seems not to be installed using Git. Can't upgrade!"
                return 1
        fi
 
@@ -248,7 +267,7 @@ function UpgradeAXZSH {
 
 function UpgradeForeignPlugins {
        if [[ $+commands[git] -eq 0 ]]; then
-               ax_msg 2 "The git(1) command is not available!"
+               ax_error "The git(1) command is not available!"
                return 1
        fi
 
@@ -258,10 +277,10 @@ function UpgradeForeignPlugins {
                        ax_msg - "Upgrading \"$name\" [git] ..."
                        (
                                cd "$dir"
-                               git pull --ff-only || ax_msg 2 "Pull failed!"
+                               git pull --ff-only || ax_error "Pull failed!"
                        )
                else
-                       ax_msg 2 "Unknown repository type!"
+                       ax_error "Unknown repository type!"
                fi
        done
 }
@@ -334,7 +353,7 @@ NAME="$0:t"
 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!"
+               ax_error "Oops, \"AXZSH\" is not set or invalid and can't be autodetected!"
                exit 3
        fi
 fi
@@ -385,7 +404,7 @@ case "$cmd" in
                ;;
        "set-theme")
                [[ $# -eq 1 ]] || Usage
-               SetTheme "$1" && UpdatePluginCache
+               SetTheme "$1"
                ;;
        "upgrade")
                [[ $# -eq 0 ]] || Usage
@@ -397,6 +416,11 @@ case "$cmd" in
                [[ $# -eq 0 ]] || Usage
                UpdatePluginCache
                ;;
-       *)
+       "--help")
                Usage
+               ;;
+       *)
+               ax_error "Invalid command \"$cmd\"!"
+               ax_error "Try \"$0 --help\" for more information."
+               exit 2
 esac