From fe3baa4eb207cd47940ffb4952892dfc8b08248e Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Sat, 21 Mar 2020 23:54:25 +0100
Subject: [PATCH] Rename shorter command and add default

---
 commands                                       |  2 +-
 subcommands/default                            | 16 ++++++++++++++++
 subcommands/{add-vault-password => vault-pass} | 10 +++++-----
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100755 subcommands/default
 rename subcommands/{add-vault-password => vault-pass} (72%)

diff --git a/commands b/commands
index 8c06f36..bf65595 100755
--- a/commands
+++ b/commands
@@ -11,7 +11,7 @@ case "$1" in
       #shellcheck disable=SC2034
       declare desc="return ansible-playbook plugin help content"
       cat<<help_content
-    ansible:add-vault-password, Insert new vault password for encrypt/decrypt of passwords
+    ansible:vault-pass, Insert new vault password for encrypt/decrypt of passwords
 help_content
     }
 
diff --git a/subcommands/default b/subcommands/default
new file mode 100755
index 0000000..14c16ac
--- /dev/null
+++ b/subcommands/default
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+ansible_default_cmd() {
+    echo -e 'Usage: dokku ansible[:COMMAND]'
+    echo ''
+    echo 'Run ansible playbooks during deployment'
+    echo ''
+    echo 'Commands:'
+    cat<<help_content
+  ansible:vault-pass, Insert new vault password for encrypt/decrypt of passwords
+help_content
+}
+
+ansible_default_cmd "$@"
diff --git a/subcommands/add-vault-password b/subcommands/vault-pass
similarity index 72%
rename from subcommands/add-vault-password
rename to subcommands/vault-pass
index 4ab846d..934f8ba 100755
--- a/subcommands/add-vault-password
+++ b/subcommands/vault-pass
@@ -4,11 +4,11 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
-ansible_add_vault_password_cmd() {
+ansible_vault_pass_cmd() {
   #shellcheck disable=SC2034
   declare desc="insert new vault password for encrypt/decrypt of passwords"
 
-  if [[ -f "$DOKKU_LIB/data/ansible/.vault-password" ]]; then
+  if [[ -f "$DOKKU_LIB/data/ansible/.vault-pass" ]]; then
     dokku_col_log_info1_quiet "Vault password already in place"
     exit 0
   fi
@@ -20,9 +20,9 @@ ansible_add_vault_password_cmd() {
     mkdir -p "$DOKKU_LIB/data/ansible"
   fi
 
-  dokku_col_log_info1_quiet "Generating $DOKKU_LIB/data/ansible/.vault-password"
-  echo "$vault_password" > "$DOKKU_LIB/data/ansible/.vault-password"
+  dokku_col_log_info1_quiet "Generating $DOKKU_LIB/data/ansible/.vault-pass"
+  echo "$vault_password" > "$DOKKU_LIB/data/ansible/.vault-pass"
 
 }
 
-ansible_add_vault_password_cmd "$@"
+ansible_vault_pass_cmd "$@"