From 5723df4790389aac8fcbbe0ad2e1e6929c23e57a Mon Sep 17 00:00:00 2001
From: dodger <dodger@ciberterminal.net>
Date: Tue, 15 Aug 2023 09:42:54 +0200
Subject: [PATCH] script tweak

---
 platform9and3quarters.config.tmpl |  8 ++++++++
 platform9and3quarters.sh          | 18 ++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/platform9and3quarters.config.tmpl b/platform9and3quarters.config.tmpl
index 99bef0e..2732b44 100644
--- a/platform9and3quarters.config.tmpl
+++ b/platform9and3quarters.config.tmpl
@@ -12,3 +12,11 @@ SMTPHOST="mta.thecompany.com"
 SMTPUSER="smtp user"
 SMTPPASS="smpt host"
 MAILXBIN="/usr/bin/s-nail"
+
+declare -a MANDATORYHEADERS
+MANDATORYHEADERS=( 'Accept: application/json, text/plain, */*' 'Content-Type: application/json;charset=UTF-8' )
+
+declare -a SIGNINHEADERS
+SIGNINHEADERS=( 'Origin: https://thecompany.woffu.com' 'Host: thecompany.woffu.com:443' 'Expect:' )
+
+
diff --git a/platform9and3quarters.sh b/platform9and3quarters.sh
index c08786e..51572a4 100755
--- a/platform9and3quarters.sh
+++ b/platform9and3quarters.sh
@@ -40,11 +40,13 @@ RESET="\033[0;00m"
 QUIETOUTPUT=false
 NOW="$(date +%Y%m%d%H%M%S)"
 
-OUTPUTFILE="$(dirname "$(readlink -f "$0")")/logs/${NOW}_outputfile_$(basename "$0" .sh).log"
-CONFIGFILE="$(dirname "$(readlink -f "$0")")/$(basename "$(readlink -f "$0")" .sh).config"
+SCRIPT_PATH="$(dirname "$(readlink -f "$0")")"
 
-SCRIPTLOG="$(dirname "$(readlink -f "$0")")/logs/${NOW}_scriptlog_$(basename "$0" .sh).log"
-SCRIPTLOGERR="$(dirname "$(readlink -f "$0")")/logs/${NOW}_scriptlog_$(basename "$0" .sh).err"
+OUTPUTFILE="${SCRIPT_PATH}/logs/${NOW}_outputfile_$(basename "$0" .sh).log"
+CONFIGFILE="${SCRIPT_PATH}/$(basename "$(readlink -f "$0")" .sh).config"
+
+SCRIPTLOG="${SCRIPT_PATH}/logs/${NOW}_scriptlog_$(basename "$0" .sh).log"
+SCRIPTLOGERR="${SCRIPT_PATH}/logs/${NOW}_scriptlog_$(basename "$0" .sh).err"
 
 AUXFILE=$(mktemp)
 TMPFILE=$(mktemp)
@@ -53,14 +55,6 @@ TMPFILE=$(mktemp)
 #MANDATORYHEADERS="${MANDATORYHEADERS} -H \"Content-Type: application/json;charset=UTF-8\""
 ## TEDDYBEAR added after sourcing config file
 
-
-declare -a MANDATORYHEADERS
-MANDATORYHEADERS=( 'Accept: application/json, text/plain, */*' 'Content-Type: application/json;charset=UTF-8' )
-
-declare -a SIGNINHEADERS
-SIGNINHEADERS=( 'Origin: https://voxelgroup.woffu.com' 'Host: voxelgroup.woffu.com:443' 'Expect:' )
-
-
 ##############################################
 #
 #/CONFIG