From 17203b1ec1e9962d1fcbe88fa87a5efac73707a9 Mon Sep 17 00:00:00 2001
From: Juan Javier Baca <juan@bacamt.com>
Date: Thu, 16 Apr 2020 04:41:44 +0200
Subject: [PATCH] Add alternative working dirs

Despite changing working dir from command line covers most usage cases,
others defaults are also usefull like /etc/getssl, SCRIPTDIR/conf or
SCRIPTDIR/.getssl. Last candidate (~/.getssl) is used if no config file
was found in previous paths.
---
 getssl | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/getssl b/getssl
index a0c530c..a465376 100755
--- a/getssl
+++ b/getssl
@@ -220,6 +220,7 @@
 # 2020-03-23 Fix staging server URL in domain template (2.21)
 # 2020-03-30 Fix error message find_dns_utils from over version of "command"
 # 2020-03-30 Fix problems if domain name isn't in lowercase (2.22)
+# 2020-04-16 Add alternative working dirs '/etc/getssl/' '${SCRIPTDIR}/conf' '${SCRIPTDIR}/.getssl'
 # ----------------------------------------------------------------------------------------
 
 PROGNAME=${0##*/}
@@ -261,7 +262,7 @@ TEMP_UPGRADE_FILE=""
 TOKEN_USER_ID=""
 USE_SINGLE_ACL="false"
 VALIDATE_VIA_DNS=""
-WORKING_DIR=~/.getssl
+WORKING_DIR_CANDIDATES=('/etc/getssl/' '${SCRIPTDIR}/conf' '${SCRIPTDIR}/.getssl' '~/.getssl')
 _CHECK_ALL=0
 _CREATE_CONFIG=0
 _FORCE_RENEW=0
@@ -2179,6 +2180,7 @@ requires which
 requires openssl
 requires curl
 requires dig nslookup drill host DNS_CHECK_FUNC
+requires dirname
 requires awk
 requires tr
 requires date
@@ -2216,6 +2218,22 @@ if [[ -z "$DOMAIN" ]] && [[ ${_CHECK_ALL} -ne 1 ]]; then
   graceful_exit
 fi
 
+# Test working directory candidates if unset. Last candidate defaults (~/getssl/)
+if [[ -z "${WORKING_DIR}" ]]
+then
+  SCRIPTDIR="$(cd "$(dirname "$0")"; pwd -P;)"
+  for WDCC in $(seq 0 $((${#WORKING_DIR_CANDIDATES[@]}-1)) )
+  do
+    WORKING_DIR="$(eval echo "${WORKING_DIR_CANDIDATES[$WDCC]}")"
+
+    debug "Testing working dir location '${WORKING_DIR}'"
+    if [[ -s "$WORKING_DIR/getssl.cfg" ]]
+    then
+      break
+    fi
+  done
+fi
+
 # if the "working directory" doesn't exist, then create it.
 if [[ ! -d "$WORKING_DIR" ]]; then
   debug "Making working directory - $WORKING_DIR"