From 049ff109f8e0cde2fe6e4e92871669a1e8c2b903 Mon Sep 17 00:00:00 2001 From: oupala Date: Wed, 29 May 2019 16:54:44 +0200 Subject: [PATCH 1/3] chore: bump version from 2.0.0 to 2.0.1-dev --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 76930a4..7c1419b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "apaxy", - "version": "2.0.0", + "version": "2.0.1-dev", "description": "A simple, customisable theme for your Apache directory listing.", "main": "index.js", "scripts": { From 367722a9738e3b9459ff1928ef2d6b2b1fef02ba Mon Sep 17 00:00:00 2001 From: oupala Date: Thu, 30 May 2019 22:22:24 +0200 Subject: [PATCH 2/3] 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" From b525e7e19c2f64728096d58ac60f56114f5f1008 Mon Sep 17 00:00:00 2001 From: oupala Date: Thu, 30 May 2019 22:26:32 +0200 Subject: [PATCH 3/3] chore: bump version from 2.0.1-dev to 2.0.1 --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) 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/package.json b/package.json index 7c1419b..ca914e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "apaxy", - "version": "2.0.1-dev", + "version": "2.0.1", "description": "A simple, customisable theme for your Apache directory listing.", "main": "index.js", "scripts": {