From 0062227c579689727e0399aae09a9b538dfc0c0c Mon Sep 17 00:00:00 2001
From: Omar Shehata <omar.sameh.shehata@gmail.com>
Date: Sat, 3 Dec 2016 19:08:25 +0000
Subject: [PATCH] Revert "Added certs default help function"

This reverts commit d001fcc89609b7d69f5358d5330cf5cb464e2796.
---
 plugins/certs/commands            | 23 ++++++++++++++++++++---
 plugins/certs/functions           | 24 ------------------------
 plugins/certs/subcommands/default | 13 -------------
 3 files changed, 20 insertions(+), 40 deletions(-)
 delete mode 100644 plugins/certs/subcommands/default

diff --git a/plugins/certs/commands b/plugins/certs/commands
index e04a558a3..c34b902c8 100755
--- a/plugins/certs/commands
+++ b/plugins/certs/commands
@@ -1,14 +1,31 @@
 #!/usr/bin/env bash
 [[ " help certs:help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_AVAILABLE_PATH/certs/functions"
 
 case "$1" in
   help | certs:help)
-    
+    help_content_func () {
+      declare desc="return certs plugin help content"
+      cat<<help_content
+    certs, Manage Dokku apps SSL (TLS) certs
+    certs:add <app> CRT KEY, Add an ssl endpoint to an app. Can also import from a tarball on stdin
+    certs:chain CRT [CRT ...], [NOT IMPLEMENTED] Print the ordered and complete chain for the given certificate
+    certs:generate <app> DOMAIN, Generate a key and certificate signing request (and self-signed certificate)
+    certs:info <app>, Show certificate information for an ssl endpoint
+    certs:key <app> CRT KEY [KEY ...], [NOT IMPLEMENTED] Print the correct key for the given certificate
+    certs:remove <app>, Remove an SSL Endpoint from an app
+    certs:rollback <app>, [NOT IMPLEMENTED] Rollback an SSL Endpoint for an app
+    certs:update <app> CRT KEY, Update an SSL Endpoint on an app. Can also import from a tarball on stdin
+help_content
+    }
 
     if [[ $1 = "certs:help" ]] ; then
-        help_formatted
+        echo -e 'Usage: dokku certs:COMMAND'
+        echo ''
+        echo 'Manage Dokku apps SSL (TLS) certs.'
+        echo ''
+        echo 'Additional commands:'
+        help_content_func | sort | column -c2 -t -s,
     else
         help_content_func
     fi
diff --git a/plugins/certs/functions b/plugins/certs/functions
index 77d10de83..a130c993e 100755
--- a/plugins/certs/functions
+++ b/plugins/certs/functions
@@ -2,30 +2,6 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
-help_formatted (){
-  echo -e 'Usage: dokku certs:COMMAND'
-  echo ''
-  echo 'Manage Dokku apps SSL (TLS) certs.'
-  echo ''
-  echo 'Additional commands:'
-  help_content_func | sort | column -c2 -t -s,
-}
-
-help_content_func () {
-      declare desc="return certs plugin help content"
-      cat<<help_content
-    certs, Manage Dokku apps SSL (TLS) certs
-    certs:add <app> CRT KEY, Add an ssl endpoint to an app. Can also import from a tarball on stdin
-    certs:chain CRT [CRT ...], [NOT IMPLEMENTED] Print the ordered and complete chain for the given certificate
-    certs:generate <app> DOMAIN, Generate a key and certificate signing request (and self-signed certificate)
-    certs:info <app>, Show certificate information for an ssl endpoint
-    certs:key <app> CRT KEY [KEY ...], [NOT IMPLEMENTED] Print the correct key for the given certificate
-    certs:remove <app>, Remove an SSL Endpoint from an app
-    certs:rollback <app>, [NOT IMPLEMENTED] Rollback an SSL Endpoint for an app
-    certs:update <app> CRT KEY, Update an SSL Endpoint on an app. Can also import from a tarball on stdin
-help_content
-    }
-
 is_ssl_enabled() {
   declare desc="returns 0 if ssl is enabled for given app"
   local APP=$1; verify_app_name "$APP"
diff --git a/plugins/certs/subcommands/default b/plugins/certs/subcommands/default
deleted file mode 100644
index f9869973a..000000000
--- a/plugins/certs/subcommands/default
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_AVAILABLE_PATH/certs/functions"
-
-certs_main_cmd() {
-  declare desc="return certs plugin help content"
-  local cmd="certs"
-  help_formatted
-}
-
-certs_main_cmd "$@"
-