axzshctl: Fix "usage" message

[ax-zsh.git] / bin / axzshctl

diff --git a/bin/axzshctl b/bin/axzshctl
index 4af22b41223b01ac32bf9867de0ac6333a00791a..0e310a4244cbb6c16d94a43002f19b330f42d13e 100755 (executable)
--- a/bin/axzshctl
+++ b/bin/axzshctl
@@ -23,7 +23,7 @@ fi
 unset dir ax_common ax_common_sourced
 
 function Usage {
-       echo "$NAME <command> [...]"
+       echo "Usage: $NAME <command> [...]"
        echo
        echo "  enable-plugin <name|directory> [<name|directory> [...]]"
        echo "    Enable plugin(s)."
@@ -37,6 +37,9 @@ function Usage {
        echo "  enable-default-plugins"
        echo "    Enable all default plugins."
        echo
+       echo "  upgrade"
+       echo "    Upgrade AX-ZSH installation (requires Git)."
+       echo
        exit 2
 }
 
@@ -52,6 +55,7 @@ function EnablePlugin {
                "$plugin:A"
                "$AXZSH_PLUGIN_D/$plugin"
                "$ZSH_CUSTOM/$plugin"
+               "$AXZSH/custom_plugins/$plugin"
                "$AXZSH/plugins/$plugin"
                "$AXZSH/default_plugins/$plugin"
                "$AXZSH/core/$plugin"
@@ -103,6 +107,20 @@ function EnableDefaultPlugins {
        return $?
 }
 
+function UpgradeAXZSH {
+       if [[ $+commands[git] -eq 0 ]]; then
+               ax_msg 2 "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!"
+               return 1
+       fi
+
+       ax_msg - "Upgrading AX-ZSH in \"$AXZSH\" using git(1) ..."
+       ( cd "$AXZSH" && git pull --ff-only )
+}
+
 NAME="$(basename "$0")"
 
 [[ $# -gt 0 ]] || Usage
@@ -137,6 +155,10 @@ case "$cmd" in
                [[ $# -eq 0 ]] || Usage
                EnableDefaultPlugins
                ;;
+       "upgrade")
+               [[ $# -eq 0 ]] || Usage
+               UpgradeAXZSH
+               ;;
        *)
                Usage
 esac