From e99e0b02d47c4e055c6bae0dd2a01913ba5e42d2 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 20 Feb 2017 18:33:53 -0700
Subject: [PATCH] refactor: move storage:help to internal-functions

---
 plugins/storage/commands           | 22 ++--------------------
 plugins/storage/internal-functions | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 20 deletions(-)
 create mode 100755 plugins/storage/internal-functions

diff --git a/plugins/storage/commands b/plugins/storage/commands
index 337f07473..d4335a84c 100755
--- a/plugins/storage/commands
+++ b/plugins/storage/commands
@@ -1,29 +1,11 @@
 #!/usr/bin/env bash
 [[ " storage:help help " == *" $1 "* ]] || exit "$DOKKU_NOT_IMPLEMENTED_EXIT"
+source "$PLUGIN_AVAILABLE_PATH/storage/internal-functions"
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 case "$1" in
   help | storage:help)
-    help_content_func () {
-      declare desc="return storage plugin help content"
-      cat<<help_content
-    storage, Mount local volume / directories inside containers
-    storage:list <app>, List bind mounts for app's container(s) (host:container)
-    storage:mount <app> <host-dir:container-dir>, Create a new bind mount
-    storage:unmount <app> <host-dir:container-dir>, Remove an existing bind mount
-help_content
-    }
-
-    if [[ $1 = "shell:help" ]] ; then
-        echo -e 'Usage: dokku storage:COMMAND'
-        echo ''
-        echo 'Mount local volume / directories inside containers.'
-        echo ''
-        echo 'Additional commands:'
-        help_content_func | sort | column -c2 -t -s,
-    else
-        help_content_func
-    fi
+    storage_help_cmd "$@"
     ;;
 
   *)
diff --git a/plugins/storage/internal-functions b/plugins/storage/internal-functions
new file mode 100755
index 000000000..913af714b
--- /dev/null
+++ b/plugins/storage/internal-functions
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+storage_help_content_func() {
+    declare desc="return storage plugin help content"
+    cat<<help_content
+    storage:list <app>, List bind mounts for app's container(s) (host:container)
+    storage:mount <app> <host-dir:container-dir>, Create a new bind mount
+    storage:unmount <app> <host-dir:container-dir>, Remove an existing bind mount
+help_content
+}
+
+storage_help_cmd() {
+  if [[ $1 = "storage:help" ]] ; then
+    echo -e 'Usage: dokku storage[:COMMAND]'
+    echo ''
+    echo 'Mount local volume / directories inside containers.'
+    echo ''
+    echo 'Additional commands:'
+    storage_help_content_func | sort | column -c2 -t -s,
+  elif [[ $(ps -o command= $PPID) == *"--all"* ]]; then
+    storage_help_content_func
+  else
+    cat<<help_desc
+    storage, Mount local volume / directories inside containers
+help_desc
+  fi
+}