Rename make_parent_dir to make_parent_directory

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/functions/functions.db b/src/functions/functions.db
index 16f38626cfbf1f044c479950f6af1b63cbf9a4a4..98f253c1b29a1920b01fdcb7e81b2f812537045b 100644 (file)
--- a/src/functions/functions.db
+++ b/src/functions/functions.db
@@ -58,7 +58,7 @@ db_set() {
                log DEBUG "Adding '${key}' = '${value}'"
        fi
 
-       make_parent_dir "${path}"
+       make_parent_directory "${path}"
        print "${value}" > "${path}"
 }
 

diff --git a/src/functions/functions.util b/src/functions/functions.util
index 2e76e53fdc3ce761c5170c6140b64094cacdb88c..f096fbb79cac8e8e6ad99abfde7cf829b64ffce8 100644 (file)
--- a/src/functions/functions.util
+++ b/src/functions/functions.util
@@ -254,7 +254,7 @@ make_directory() {
        mkdir -p "${path}"
 }
 
-make_parent_dir() {
+make_parent_directory() {
        local path="${1}"
 
        make_directory "$(dirname "${path}")"

diff --git a/src/functions/functions.vpn-security-policies b/src/functions/functions.vpn-security-policies
index 435d1bcd2acd22172ba28ef26c887f1a6195da6f..d3717a9e09c05073a9edf5284b9e024da2200559 100644 (file)
--- a/src/functions/functions.vpn-security-policies
+++ b/src/functions/functions.vpn-security-policies
@@ -1039,7 +1039,7 @@ vpn_security_policies_make_ike_proposal() {
        local proposal=$(_vpn_security_policies_make_ike_proposal "${name}")
 
        # Write proposal to cache
-       if ! make_parent_dir "${cache_path}" || ! fwrite "${cache_path}" "${proposal}"; then
+       if ! make_parent_directory "${cache_path}" || ! fwrite "${cache_path}" "${proposal}"; then
                log WARNING "Could not write to cache: ${cache_path}"
        fi
 
@@ -1115,7 +1115,7 @@ vpn_security_policies_make_esp_proposal() {
        local proposal=$(_vpn_security_policies_make_esp_proposal "${name}")
 
        # Write proposal to cache
-       if ! make_parent_dir "${cache_path}" || ! fwrite "${cache_path}" "${proposal}"; then
+       if ! make_parent_directory "${cache_path}" || ! fwrite "${cache_path}" "${proposal}"; then
                log WARNING "Could not write to cache: ${cache_path}"
        fi
 

diff --git a/src/functions/functions.wpa_supplicant b/src/functions/functions.wpa_supplicant
index a8240ea40e09094260c6791b9ee3496b0bec15eb..ee5b96414073db84ae0223b1456cd8861bb69383 100644 (file)
--- a/src/functions/functions.wpa_supplicant
+++ b/src/functions/functions.wpa_supplicant
@@ -143,7 +143,7 @@ wpa_supplicant_config_write() {
        esac
 
        # Ensure we can write the file
-       make_parent_dir "${file}"
+       make_parent_directory "${file}"
 
        config_header "WPA supplicant configuration file" > ${file}