From f8c732ec22b33b9b70bf911cdd0dad082adccf75 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 25 Feb 2018 22:52:33 -0500 Subject: [PATCH] feat: default to help output when no subcommand specified Refs dokku/dokku-redis#95 --- commands | 2 +- help-functions | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/commands b/commands index aaaaffc..6253c45 100755 --- a/commands +++ b/commands @@ -1,6 +1,6 @@ #!/usr/bin/env bash source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config" -[[ " help $PLUGIN_COMMAND_PREFIX:help " == *" $1 "* ]] || [[ "$1" == "$PLUGIN_COMMAND_PREFIX:"* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT" +[[ " help $PLUGIN_COMMAND_PREFIX:help $PLUGIN_COMMAND_PREFIX $PLUGIN_COMMAND_PREFIX:default " == *" $1 "* ]] || [[ "$1" == "$PLUGIN_COMMAND_PREFIX:"* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT" source "$PLUGIN_BASE_PATH/common/functions" set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x diff --git a/help-functions b/help-functions index 0a11237..159bd97 100755 --- a/help-functions +++ b/help-functions @@ -7,7 +7,7 @@ fn-help() { declare CMD="$1" local cmd EXIT_CODE - if [[ "$CMD" == "help" ]] || [[ "$CMD" == "$PLUGIN_COMMAND_PREFIX" ]] || [[ "$CMD" == "$PLUGIN_COMMAND_PREFIX:help" ]]; then + if [[ "$CMD" == "help" ]] || [[ "$CMD" == "$PLUGIN_COMMAND_PREFIX:help" ]] || [[ "$CMD" == "$PLUGIN_COMMAND_PREFIX" ]] || [[ "$CMD" == "$PLUGIN_COMMAND_PREFIX:default" ]]; then fn-help-all "$@" exit 0 fi @@ -30,7 +30,7 @@ fn-help-all() { local CMD_OUTPUT BLUE BOLD FULL_OUTPUT NORMAL FULL_OUTPUT=true - if [[ "$CMD" = "$PLUGIN_COMMAND_PREFIX:help" ]] ; then + if [[ "$CMD" = "$PLUGIN_COMMAND_PREFIX:help" ]] || [[ "$CMD" == "$PLUGIN_COMMAND_PREFIX" ]] || [[ "$CMD" == "$PLUGIN_COMMAND_PREFIX:default" ]] ; then BOLD="$(tput bold)" NORMAL="\033[m" BLUE="\033[0;34m"