diff --git a/CHANGELOG.md b/CHANGELOG.md index 43e7ee9..d1597d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [2.0.1](https://github.com/oupala/apaxy/compare/2.0.0...2.0.1) (2019-05-30) + + +### Bug Fixes + +* make the script apaxy-configure.sh more robust ([367722a](https://github.com/oupala/apaxy/commit/367722a)) + + + # [2.0.0](https://github.com/oupala/apaxy/compare/1.0.0...2.0.0) (2019-05-29) 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"