From fd8cb04f2026e66fe6684bf34c2a2b05d0f04df1 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Tue, 24 Jan 2023 02:15:35 +0000 Subject: [PATCH] Update 2 files - /home/.chezmoiscripts/universal/run_onchange_after_11-symlink-ansible-roles.tmpl - /home/.chezmoitemplates/universal/profile --- .../run_onchange_after_11-symlink-ansible-roles.tmpl | 1 + home/.chezmoitemplates/universal/profile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/home/.chezmoiscripts/universal/run_onchange_after_11-symlink-ansible-roles.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_11-symlink-ansible-roles.tmpl index c70028d3..ed6c0a1e 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_11-symlink-ansible-roles.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_11-symlink-ansible-roles.tmpl @@ -16,6 +16,7 @@ find "$HOME/.local/src/gas-station/roles" -mindepth 2 -maxdepth 2 -type d | whil ROLE_FOLDER="professormanhattan.$(echo "$ROLE_PATH" | sed 's/.*\/\([^\/]*\)$/\1/')" ALT_ROLE_FOLDER="$(echo "$ROLE_PATH" | sed 's/.*\/\([^\/]*\)$/\1/')" if [ ! -d "$XDG_DATA_HOME/ansible/roles/$ROLE_FOLDER" ] || [ "$(readlink -f "$XDG_DATA_HOME/ansible/roles/$ROLE_FOLDER")" != "$ROLE_PATH" ]; then + logg info 'Symlinking `'"$ROLE_FOLDER"'`' rm -f "$XDG_DATA_HOME/ansible/roles/$ROLE_FOLDER" ln -s "$ROLE_PATH" "$XDG_DATA_HOME/ansible/roles/$ROLE_FOLDER" fi diff --git a/home/.chezmoitemplates/universal/profile b/home/.chezmoitemplates/universal/profile index 70734e3c..fed1b1b7 100644 --- a/home/.chezmoitemplates/universal/profile +++ b/home/.chezmoitemplates/universal/profile @@ -1,8 +1,8 @@ ### Source .bashrc if it is present if [ -f "$HOME/.bashrc" ]; then . "$HOME/.bashrc" -elif [ -f "$HOME/.config/shell/exports" ]; then - . "$HOME/.config/shell/exports" +elif [ -f "$HOME/.config/shell/exports.sh" ]; then + . "$HOME/.config/shell/exports.sh" fi ### Ensure Homebrew PATHs