]> arthur.barton.de Git - ax-zsh.git/blobdiff - bin/axzshctl
axzshctl: Embed "ax-common" compatibility functions
[ax-zsh.git] / bin / axzshctl
index 5b2be804703606103721a44cedb0ded329d375a5..17cea907be0c8c801523630b1bef2c60508b275d 100755 (executable)
@@ -1,22 +1,37 @@
 #!/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:
-for dir ("$HOME/lib" "$HOME/.ax" /usr/local /opt/ax /usr); do
-       [[ -z "$ax_common_sourced" ]] || break
-       ax_common="${dir}/lib/ax/ax-common.sh"
-       [[ -r "$ax_common" ]] && source "$ax_common"
-done
-if [[ -z "$ax_common_sourced" ]]; then
-       function ax_msg {
-               shift
-               echo "$@"
-       }
-fi
-unset dir ax_common ax_common_sourced
+# Embedded ax-common compatibility functions ...
+function ax_msg {
+       case "$1" in
+               "0")    c="32"; ;;
+               "1")    c="33"; ;;
+               "2")    c="31"; ;;
+               "-")    c="1";  ;;
+               *)      c="0";  ;;
+       esac
+       shift
+       printf "\e[${c}m%s\e[0m\n" "$@"
+}
+function ax_error {
+       ax_msg 2 "$@" >&2
+}
+
+function Version {
+       echo "ax-zsh -- Modular configuration system for the Z shell (ZSH)"
+       echo "Copyright (c) 2015-2019 Alexander Barton <alex@barton.de>."
+       echo "Licensed under the terms of the MIT license, see LICENSE.md for details."
+       echo "Homepage: <https://github.com/alexbarton/ax-zsh>"
+       if [[ -d "$AXZSH/.git" && -n "$commands[git]" ]]; then
+               echo -n "Version: Git ID "
+               ( cd "$AXZSH" && git describe --always )
+       fi
+       echo
+       exit 0
+}
 
 function Usage {
        echo "Usage: $NAME <command> [...]"
@@ -48,21 +63,22 @@ function Usage {
        echo "  update-caches"
        echo "    Force rebuild of all cache files."
        echo
-       exit 2
+       exit 0
 }
 
 function UpdatePluginCache {
        [[ -r "$AXZSH/cache" ]] || return 0
 
-       ax_msg - "Updating plugin cache ..."
+       [[ "$1" = "-v" ]] && ax_msg - "Updating plugin cache ..."
        rm -rf \
+               $AXZSH/cache/ax-io.cache \
                $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
+       AXZSH_PLUGIN_CHECK=1 zsh -ilc '' >/dev/null
 }
 
 function NormalizedPluginName {
@@ -77,17 +93,17 @@ 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\"!"
+               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
-                       ax_msg 2 "Error: Not removing \"$f\", it is not a symbolic link!"
+               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."
                fi
@@ -109,17 +125,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
+               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 "Trying to enable \"$1\" as plugin ..."
        fi
 
        for dname (
@@ -134,28 +152,47 @@ 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_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
 }
 
@@ -184,11 +221,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 $?
 }
@@ -196,19 +233,34 @@ function EnableDefaultPlugins {
 function SetTheme {
        local link_name="$AXZSH/active_theme"
 
-       if [ "$1" = "-" ]; then
+       # --- Powerlevel10k ---
+       # Remove "instant prompt" configuration, if any ...
+       rm -f "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+
+       if [[ "$1" = "-" ]]; then
                rm -f "$link_name" || return 1
-               echo "Theme settings have been reset."
+               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"
@@ -223,22 +275,23 @@ function SetTheme {
                                break
                        fi
                done
+
                if [[ -z "$theme" ]]; then
-                       echo "Theme \"$1\" not found!"
+                       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 $?
 }
 
 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,20 +301,20 @@ 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
 
        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"
-                               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
 }
@@ -271,24 +324,27 @@ function CheckPlugins {
        invalid_plugins=()
 
        ax_msg - "Checking plugins ..."
-       for dir ($AXZSH/plugins/*(N)); do
+       for dir ($AXZSH/plugins/[a-z0-9]*(N)); do
                plugin=${dir:t}
 
                # Test if plugin is already enabled
-               [[ -e "$AXZSH/active_plugins/$plugin" ]] \
-                       && enabled=" (enabled)" \
-                       || unset enabled
+               if [[ -e "$AXZSH/active_plugins/$plugin" ]]; then
+                       printf ' \e[1;32m+\e[m "\e[1m%s\e[m" ... ' "${plugin}"
+                       enabled=1
+               else
+                       printf ' \e[1;31m-\e[m "%s" ... ' "${plugin}"
+                       unset enabled
+               fi
 
                # Test plugin ...
-               printf " - \"%s\"%s ... " "$plugin" "$enabled"
                new_plugin=""
-               for script ($AXZSH/plugins/$plugin/$plugin.{zshrc,zprofile}); do
+               for script ($AXZSH/plugins/$plugin/$plugin.{zshrc,zprofile,ax-io}); do
                        [[ -r "$script" ]] || continue
                        AXZSH_PLUGIN_CHECK=1 zsh -i -c "source $script"; r=$?
                        if [[ $r -eq 0 ]]; then
                                new_plugin=$plugin
-                               break
                        fi
+                       break
                done
                if [[ -n "$new_plugin" ]]; then
                        detected_plugins+=($new_plugin)
@@ -300,7 +356,7 @@ function CheckPlugins {
                        ax_msg 1 "optional."
                else
                        [[ -n "$enabled" ]] && invalid_plugins+=($plugin)
-                       ax_msg 2 "failed."
+                       ax_msg 2 "failed ($r)."
                fi
        done
        echo
@@ -334,7 +390,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
@@ -395,8 +451,16 @@ case "$cmd" in
                ;;
        "update-caches")
                [[ $# -eq 0 ]] || Usage
-               UpdatePluginCache
+               UpdatePluginCache -v
+               ;;
+       "--version"|"version")
+               Version >&2
+               ;;
+       "--help"|"help")
+               Usage >&2
                ;;
        *)
-               Usage
+               ax_error "Invalid command \"$cmd\"!"
+               ax_error "Try \"$0 --help\" for more information."
+               exit 2
 esac