diff --git a/dokku b/dokku index c0341e2c9..21c3588c0 100755 --- a/dokku +++ b/dokku @@ -191,20 +191,20 @@ case "$1" in done # New lines are blank echos for readability - echo "Usage: dokku [--quiet|--trace|--rm-container|--rm|--force] COMMAND [command-specific-options]" - echo "" - echo "Primary help options, type \"dokku COMMAND:help\" for more details, or dokku help --all to see all commands." - echo "" - echo "Commands:" - echo "" + dokku_log_quiet "Usage: dokku [--quiet|--trace|--rm-container|--rm|--force] COMMAND [command-specific-options]" + dokku_log_quiet "" + dokku_log_quiet "Primary help options, type \"dokku COMMAND:help\" for more details, or dokku help --all to see all commands." + dokku_log_quiet "" + dokku_log_quiet "Commands:" + dokku_log_quiet "" if [[ "$2" == "--all" ]] ; then for core_plugin_command in $CORE_PLUGIN_COMMANDS; do $core_plugin_command help done | sort | column -c2 -t -s, - echo "" - echo "Community plugin commands:" - echo "" + dokku_log_quiet "" + dokku_log_quiet "Community plugin commands:" + dokku_log_quiet "" for community_plugin_command in $COMMUNITY_PLUGIN_COMMANDS; do $community_plugin_command help done | sort | column -c2 -t -s, @@ -214,9 +214,9 @@ case "$1" in # When done, sort, sed cuts arugments out of strings and colum make it pretty done | sort | sed -e '/^.*:/d' -e 's/\s[\[\<\-\(].*,/,/' | column -c2 -t -s, if [[ -n "$COMMUNITY_PLUGIN_COMMANDS" ]]; then - echo "" - echo "Community plugin commands:" - echo "" + dokku_log_quiet "" + dokku_log_quiet "Community plugin commands:" + dokku_log_quiet "" for community_plugin_command in $COMMUNITY_PLUGIN_COMMANDS; do $community_plugin_command help done | sort | column -c2 -t -s, diff --git a/plugins/common/functions b/plugins/common/functions index a5ff6caf5..85ca7e5ae 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -16,6 +16,13 @@ dokku_apps() { [[ $INSTALLED_APPS ]] && echo "$INSTALLED_APPS" } +dokku_log_quiet() { + declare desc="log quiet formatter" + if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then + echo "$*" + fi +} + dokku_log_info1() { declare desc="log info1 formatter" echo "-----> $*"