From 9d80e129dc259a6cded8d58cf8c0dc3e369c9cf4 Mon Sep 17 00:00:00 2001
From: Anthony Perkins <anthony@acperkins.com>
Date: Sat, 10 Sep 2022 23:29:47 +0100
Subject: [PATCH] Try loading all files properly again

---
 roles/home-cli/files/bashrc  | 5 +++++
 roles/home-cli/files/profile | 2 +-
 roles/home-cli/files/shrc    | 1 +
 roles/home-cli/files/zshrc   | 5 +++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/roles/home-cli/files/bashrc b/roles/home-cli/files/bashrc
index bd4375d..2fbc531 100644
--- a/roles/home-cli/files/bashrc
+++ b/roles/home-cli/files/bashrc
@@ -19,3 +19,8 @@ bind 'set bell-style none'
 bind 'set completion-ignore-case on'
 bind 'set enable-bracketed-paste off'
 export PS1="\[\033[01m\]\u@\h\\$\[\033[00m\] "
+
+if [ -r "$HOME/.shrc" ]
+then
+	. "$HOME/.shrc"
+fi
diff --git a/roles/home-cli/files/profile b/roles/home-cli/files/profile
index afa6c1e..343e243 100644
--- a/roles/home-cli/files/profile
+++ b/roles/home-cli/files/profile
@@ -49,7 +49,7 @@ then
 	. "$HOME/.profile.$(hostname -s)"
 fi
 
-if [ -r "$HOME/.shrc" ]
+if [ -z $_acp_shrc ]
 then
 	. "$HOME/.shrc"
 fi
diff --git a/roles/home-cli/files/shrc b/roles/home-cli/files/shrc
index 6ffe564..6b92597 100644
--- a/roles/home-cli/files/shrc
+++ b/roles/home-cli/files/shrc
@@ -7,6 +7,7 @@ case "$-" in
 	return 1
 	;;
 esac
+export _acp_shrc=YES
 
 if [ -d /var/acp ]
 then
diff --git a/roles/home-cli/files/zshrc b/roles/home-cli/files/zshrc
index 9e835f3..df6f5a4 100644
--- a/roles/home-cli/files/zshrc
+++ b/roles/home-cli/files/zshrc
@@ -21,3 +21,8 @@ bindkey "^[OA" history-beginning-search-backward
 bindkey "^[OB" history-beginning-search-forward
 
 export PS1="%B%n@%m%#%b "
+
+if [ -r "$HOME/.shrc" ]
+then
+	. "$HOME/.shrc"
+fi