From 71d3bddf40149879617d1d6343c83e9ae6514151 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Sun, 11 Jun 2023 18:45:23 +0200 Subject: extract path to configuration into variable * prepare for overwriting location of configuration dir --- lib/load-configuration | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'lib/load-configuration') diff --git a/lib/load-configuration b/lib/load-configuration index 22b6608..ca1a713 100755 --- a/lib/load-configuration +++ b/lib/load-configuration @@ -141,21 +141,23 @@ fi # possibly pull in custom modifications -if [ -r "${base_dir}/conf/common.conf" ]; then +conf_dir="${base_dir}/conf" + +if [ -r "${conf_dir}/common.conf" ]; then # shellcheck source=/dev/null - . "${base_dir}/conf/common.conf" + . "${conf_dir}/common.conf" fi if ${i_am_the_master} && \ - [ -r "${base_dir}/conf/master.conf" ]; then + [ -r "${conf_dir}/master.conf" ]; then # shellcheck source=/dev/null - . "${base_dir}/conf/master.conf" + . "${conf_dir}/master.conf" fi if ! ${i_am_the_master} && \ - [ -r "${base_dir}/conf/slave.conf" ]; then + [ -r "${conf_dir}/slave.conf" ]; then # shellcheck source=../conf/slave.conf.example - . "${base_dir}/conf/slave.conf" + . "${conf_dir}/slave.conf" fi # check / set up environment -- cgit v1.2.3-54-g00ecf