From cdef6419b46d66747bb1edf324dc41223da87c14 Mon Sep 17 00:00:00 2001
From: Grégoire Duchêne <gduchene@awhk.org>
Date: Sat, 8 Jul 2023 12:10:11 +0100
Subject: zsh: Iterate through variants in source_if_exists

---
 zsh/env | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'zsh/env')

diff --git a/zsh/env b/zsh/env
index 5df08b1..cec4b06 100644
--- a/zsh/env
+++ b/zsh/env
@@ -5,7 +5,12 @@ dotfiles_root() {
 }
 
 source_if_exists() {
-  [[ -f $(dotfiles_root)/$1 ]] && . $(dotfiles_root)/$1 || return 0
+  local prefix file
+  for prefix in ${UNAME} ${DOMAIN} ${HOST_SHORT} ${HOST}; do
+    file=$(dotfiles_root)/dotfiles-${prefix}/$1
+    [[ -f ${file} ]] && . ${file}
+  done
+  return 0
 }
 
 export HOST=${HOST:l}
@@ -18,6 +23,4 @@ esac
 
 setopt EXTENDED_GLOB
 
-source_if_exists dotfiles-${UNAME}/zsh/env
-source_if_exists dotfiles-${DOMAIN}/zsh/env
-source_if_exists dotfiles-${HOST}/zsh/env
+source_if_exists zsh/env
-- 
cgit v1.2.3-70-g09d2