From 367722a9738e3b9459ff1928ef2d6b2b1fef02ba Mon Sep 17 00:00:00 2001
From: oupala <oupala@users.noreply.github.com>
Date: Thu, 30 May 2019 22:22:24 +0200
Subject: [PATCH] fix: make the script apaxy-configure.sh more robust

The script apaxy-configure.sh can now be launched from anywhere in the system, and not only from the `apaxy` directory.

This is very useful when the context is managed by another tool, such as ansible.
---
 apaxy-configure.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 apaxy-configure.sh

diff --git a/apaxy-configure.sh b/apaxy-configure.sh
old mode 100644
new mode 100755
index 795d9ea..36bcdb0
--- a/apaxy-configure.sh
+++ b/apaxy-configure.sh
@@ -22,6 +22,8 @@ defaultApacheWebRootPath="/var/www/html"
 defaultInstallWebPath=""
 defaultEnableGallery=false
 
+workingDirectory="$(dirname "${0}")"
+
 # functions
 
 ###
@@ -84,8 +86,6 @@ log () {
 }
 
 # getting parameters value from config file (can be overloaded by cli values)
-workingDirectory=$(dirname "$0")
-
 if [ -f "${workingDirectory}/apaxy.config" ]; then
     # shellcheck source=apaxy.config
     source "${workingDirectory}/apaxy.config"
@@ -189,7 +189,7 @@ if [ ! -d "${installDir}" ] || [ ! -w "${installDir}" ]; then
 fi
 
 log 1 "- copying apaxy in install directory"
-cp -r apaxy/* "${installDir}/"
+cp -r ${workingDirectory}/apaxy/* "${installDir}/"
 
 log 1 "- configuring apaxy in install directory"