aboutsummaryrefslogtreecommitdiff
path: root/lib/30-files
diff options
context:
space:
mode:
authorCullum Smith <cullum@sacredheartsc.com>2024-07-11 21:25:13 -0400
committerCullum Smith <cullum@sacredheartsc.com>2024-07-11 21:25:13 -0400
commit010a4bc91e745ef34175b521830f9c2b644cb0e6 (patch)
tree942b639b1a86e73679fcff312e3bf1562512ff14 /lib/30-files
parent23447b9622b3e39fce4737aa913f830710618adf (diff)
downloadinfrastructure-010a4bc91e745ef34175b521830f9c2b644cb0e6.tar.gz
make boxconf command line more intuitive, fix undef vars
Diffstat (limited to 'lib/30-files')
-rw-r--r--lib/30-files34
1 files changed, 17 insertions, 17 deletions
diff --git a/lib/30-files b/lib/30-files
index fb4bbee..767bbeb 100644
--- a/lib/30-files
+++ b/lib/30-files
@@ -3,23 +3,23 @@
_boxconf_try_files(){
# Get the highest precedence file for a given path.
# $1 = target file path
- for _bcsf_file in \
- "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_HOSTNAME}" \
- "${BOXCONF_FILE_DIR}${1}.${BOXCONF_HOSTNAME}" \
- "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_HOSTCLASS}.${BOXCONF_OS_DISTRIBUTION}" \
- "${BOXCONF_FILE_DIR}${1}.${BOXCONF_HOSTCLASS}.${BOXCONF_OS_DISTRIBUTION}" \
- "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_OS_DISTRIBUTION}.${BOXCONF_HOSTCLASS}" \
- "${BOXCONF_FILE_DIR}${1}.${BOXCONF_OS_DISTRIBUTION}.${BOXCONF_HOSTCLASS}" \
- "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_HOSTCLASS}.${BOXCONF_OS_FAMILY}" \
- "${BOXCONF_FILE_DIR}${1}.${BOXCONF_HOSTCLASS}.${BOXCONF_OS_FAMILY}" \
- "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_OS_FAMILY}.${BOXCONF_HOSTCLASS}" \
- "${BOXCONF_FILE_DIR}${1}.${BOXCONF_OS_FAMILY}.${BOXCONF_HOSTCLASS}" \
- "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_HOSTCLASS}" \
- "${BOXCONF_FILE_DIR}${1}.${BOXCONF_HOSTCLASS}" \
- "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_OS_DISTRIBUTION}" \
- "${BOXCONF_FILE_DIR}${1}.${BOXCONF_OS_DISTRIBUTION}" \
- "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_OS_FAMILY}" \
- "${BOXCONF_FILE_DIR}${1}.${BOXCONF_OS_FAMILY}" \
+ for _bcsf_file in \
+ "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_HOSTNAME}" \
+ "${BOXCONF_FILE_DIR}${1}.${BOXCONF_HOSTNAME}" \
+ "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_HOSTCLASS}.${BOXCONF_DISTRO}" \
+ "${BOXCONF_FILE_DIR}${1}.${BOXCONF_HOSTCLASS}.${BOXCONF_DISTRO}" \
+ "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_DISTRO}.${BOXCONF_HOSTCLASS}" \
+ "${BOXCONF_FILE_DIR}${1}.${BOXCONF_DISTRO}.${BOXCONF_HOSTCLASS}" \
+ "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_HOSTCLASS}.${BOXCONF_OS}" \
+ "${BOXCONF_FILE_DIR}${1}.${BOXCONF_HOSTCLASS}.${BOXCONF_OS}" \
+ "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_OS}.${BOXCONF_HOSTCLASS}" \
+ "${BOXCONF_FILE_DIR}${1}.${BOXCONF_OS}.${BOXCONF_HOSTCLASS}" \
+ "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_HOSTCLASS}" \
+ "${BOXCONF_FILE_DIR}${1}.${BOXCONF_HOSTCLASS}" \
+ "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_DISTRO}" \
+ "${BOXCONF_FILE_DIR}${1}.${BOXCONF_DISTRO}" \
+ "${BOXCONF_SITE_FILE_DIR}${1}.${BOXCONF_OS}" \
+ "${BOXCONF_FILE_DIR}${1}.${BOXCONF_OS}" \
"${BOXCONF_SITE_FILE_DIR}${1}.common" \
"${BOXCONF_FILE_DIR}${1}.common"
do