mirror/apaxy
1
0
Fork 0
mirror of https://github.com/oupala/apaxy.git synced 2025-08-22 16:12:59 +02:00
Code Issues Releases Wiki Activity

Merge branch 'fix/2.0.1' into develop

Browse Source
This commit is contained in:
oupala
2019-05-30 22:29:11 +02:00
parent ca63ea21a8 b525e7e19c
commit 8f7897495f
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@@ -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) # [2.0.0](https://github.com/oupala/apaxy/compare/1.0.0...2.0.0) (2019-05-29)

6
apaxy-configure.sh Normal file → Executable file
View File

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