Try loading all files properly again

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

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

roles/home-cli/files/shrc

@@ -7,6 +7,7 @@ case "$-" in
 	return 1
 	;;
 esac
+export _acp_shrc=YES
 
 if [ -d /var/acp ]
 then

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