From f107265e3b9b94ed0e33654e0d1e48707eb6b050 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 11 Sep 2017 03:53:05 -0400
Subject: [PATCH] feat: prepare ground for config directory changes

---
 commands       | 6 +++++-
 config         | 1 +
 help-functions | 6 ++++--
 install        | 5 ++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/commands b/commands
index 19f4e07..aaaaffc 100755
--- a/commands
+++ b/commands
@@ -1,12 +1,16 @@
 #!/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"
+source "$PLUGIN_BASE_PATH/common/functions"
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/help-functions"
 
+if [[ ! -d $PLUGIN_CONFIG_ROOT ]]; then
+  dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugin:install"
+fi
+
 if [[ ! -d $PLUGIN_DATA_ROOT ]]; then
-  source "$PLUGIN_BASE_PATH/common/functions"
   dokku_log_fail "$PLUGIN_SERVICE: Please run: sudo dokku plugin:install"
 fi
 
diff --git a/config b/config
index 8e21adc..9d5226c 100644
--- a/config
+++ b/config
@@ -4,6 +4,7 @@ export POSTGRES_IMAGE_VERSION=${POSTGRES_IMAGE_VERSION:="9.6.4"}
 export POSTGRES_ROOT=${POSTGRES_ROOT:="/var/lib/dokku/services/postgres"}
 
 export PLUGIN_COMMAND_PREFIX="postgres"
+export PLUGIN_CONFIG_ROOT="${DOKKU_LIB_ROOT}/config/${PLUGIN_COMMAND_PREFIX}"
 export PLUGIN_DATA_ROOT=$POSTGRES_ROOT
 export PLUGIN_DATASTORE_PORTS=(5432)
 export PLUGIN_DATASTORE_WAIT_PORT=5432
diff --git a/help-functions b/help-functions
index 1c32354..0a11237 100755
--- a/help-functions
+++ b/help-functions
@@ -88,6 +88,8 @@ fn-help-contents-subcommand() {
   fi
 
   args="$(fn-help-subcommand-args "$CLEAN_FILE" "$FULL_OUTPUT")"
+  SUBCOMMAND=":$SUBCOMMAND"
+  [[ "$SUBCOMMAND" == ":default" ]] && SUBCOMMAND=""
   cmd_line="$(echo -e "${SUBCOMMAND} ${args}" | sed -e 's/[[:space:]]*$//')"
   desc="$(grep desc "$CLEAN_FILE" | head -1)"
   eval "$desc"
@@ -98,13 +100,13 @@ fn-help-contents-subcommand() {
   NORMAL="\033[m"
   LIGHT_GRAY="\033[2;37m"
   LIGHT_RED="\033[1;31m"
-  CMD_OUTPUT="$(echo -e "    ${PLUGIN_COMMAND_PREFIX}:${cmd_line}, ${LIGHT_GRAY}${desc}${NORMAL}")"
+  CMD_OUTPUT="$(echo -e "    ${PLUGIN_COMMAND_PREFIX}${cmd_line}, ${LIGHT_GRAY}${desc}${NORMAL}")"
   if [[ "$FULL_OUTPUT" != "true" ]]; then
     echo "$CMD_OUTPUT"
     return 0
   fi
 
-  echo -e "${BOLD}usage:${NORMAL} dokku ${PLUGIN_COMMAND_PREFIX}:${cmd_line}"
+  echo -e "${BOLD}usage:${NORMAL} dokku ${PLUGIN_COMMAND_PREFIX}${cmd_line}"
   echo ''
   echo -e "${BOLD}${desc}${NORMAL}"
   echo ''
diff --git a/install b/install
index baced9a..57f8833 100755
--- a/install
+++ b/install
@@ -16,9 +16,12 @@ plugin-install() {
   pull-docker-image "dokkupaas/s3backup:0.8.0"
   pull-docker-image "busybox:latest"
 
-  mkdir -p "$PLUGIN_DATA_ROOT" || echo "Failed to create $PLUGIN_SERVICE directory"
+  mkdir -p "$PLUGIN_DATA_ROOT" || echo "Failed to create $PLUGIN_SERVICE data directory"
   chown dokku:dokku "$PLUGIN_DATA_ROOT"
 
+  mkdir -p "$PLUGIN_CONFIG_ROOT" || echo "Failed to create $PLUGIN_SERVICE config directory"
+  chown dokku:dokku "$PLUGIN_CONFIG_ROOT"
+
   rm -f "/etc/sudoers.d/dokku-${PLUGIN_COMMAND_PREFIX}*"
   _SUDOERS_FILE="/etc/sudoers.d/dokku-${PLUGIN_COMMAND_PREFIX}"