diff --git a/roles/home-cli/files/profile b/roles/home-cli/files/profile index 0790c29..e3fc8cf 100644 --- a/roles/home-cli/files/profile +++ b/roles/home-cli/files/profile @@ -31,11 +31,11 @@ export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}" # Locale and language. ## Clear the existing locale settings and set options I always want. export TZ=Europe/London # Can override this elsewhere if needed. -if [ -f /etc/locale.conf ] +if [ -r /etc/locale.conf ] then - /etc/locale.conf + . /etc/locale.conf fi -if [ -f "$XDG_CONFIG_HOME/locale.conf" ] +if [ -r "$XDG_CONFIG_HOME/locale.conf" ] then . "$XDG_CONFIG_HOME/locale.conf" fi diff --git a/roles/home-cli/files/shrc b/roles/home-cli/files/shrc index 31498d7..c720ec3 100644 --- a/roles/home-cli/files/shrc +++ b/roles/home-cli/files/shrc @@ -163,7 +163,7 @@ then export SSH_AGENT_PID="${SSH_AGENT_PID:-$XDG_STATE_HOME/ssh-agent.pid}" if [ ! -S "$SSH_AUTH_SOCK" ] then - ssh-agent -a "$SSH_AUTH_SOCK" + eval $(ssh-agent -a "$SSH_AUTH_SOCK") fi fi