From 1da1c8a7fe70f448a5deb873e139d44eeeaf5c4b Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Thu, 2 Apr 2020 18:39:15 +0200
Subject: [PATCH] extract function for jail config directory

---
 lib/includes | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/includes b/lib/includes
index 5d5427f..b6ef4a5 100755
--- a/lib/includes
+++ b/lib/includes
@@ -111,10 +111,17 @@ inc_path() {
 
     echo "${INCDIR}/${jail_name}/${inc_name}"
 }
+jail_config_dir() {
+    jail_name=${1:?}
+
+    echo "${CONFDIR}/${jail_name}.d"
+}
 jail_incs_policy_file() {
     jail_name=${1:?}
 
-    echo "${CONFDIR}/${jail_name}.d/incs_policy"
+    jail_config_dir=$(jail_config_dir "${jail_name}")
+
+    echo "${jail_config_dir}/incs_policy"
 }
 current_jail_incs_policy_file() {
     jail_name=${1:?}
@@ -133,12 +140,14 @@ current_jail_incs_policy_file() {
 jail_check_policy_file() {
     jail_name=${1:?}
 
-    echo "${CONFDIR}/${jail_name}.d/check_policy"
+    jail_config_dir=$(jail_config_dir "${jail_name}")
+
+    echo "${jail_config_dir}/check_policy"
 }
 current_jail_check_policy_file() {
     jail_name=${1:?}
 
-    new_file="${CONFDIR}/${jail_name}.d/check_policy"
+    new_file="$(jail_check_policy_file "${jail_name}")"
     # old_file="${JAILDIR}/${jail_name}/etc/bkctld-check"
 
     if [ -f "${new_file}" ]; then