From bde906a55f12fad9790c353f6bca3781cedb09c6 Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Wed, 10 Feb 2021 00:29:00 +0000 Subject: [PATCH] Load shrc if not already loaded --- roles/home-cli/files/profile | 3 ++- roles/home-cli/files/shrc | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/home-cli/files/profile b/roles/home-cli/files/profile index ebaf7b4..27ad1e6 100644 --- a/roles/home-cli/files/profile +++ b/roles/home-cli/files/profile @@ -1,4 +1,5 @@ #!/bin/sh +export ACP_PROFILE=1 #if [ -r /etc/profile ]; then # . /etc/profile @@ -15,6 +16,6 @@ if [ -r $HOME/.profile.$(hostname -s) ]; then . $HOME/.profile.$(hostname -s) fi -if [ -n "$SSH_TTY" ]; then +if [ -z "$ACP_SHRC" ] || [ -n "$SSH_TTY" ]; then . $HOME/.shrc fi diff --git a/roles/home-cli/files/shrc b/roles/home-cli/files/shrc index 7d7551a..85244b6 100644 --- a/roles/home-cli/files/shrc +++ b/roles/home-cli/files/shrc @@ -1,4 +1,5 @@ #!/bin/sh +export ACP_SHRC=1 if [ "$ZSH_VERSION" ]; then emulate sh -c 'source /etc/profile'