ivuorinen/dotfiles
1
0
Fork 0
mirror of https://github.com/ivuorinen/dotfiles.git synced 2026-02-14 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(shell): change how shell detection works

Browse Source
This commit is contained in:
Ismo Vuorinen
2023-09-29 15:52:16 +03:00
parent dfb7a51786
commit 4b45c89a90
6 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
local/bin/x-load-configs
View File

@@ -3,20 +3,21 @@
# Copyright (c) 2023 Ismo Vuorinen. All Rights Reserved.
: "${DOTFILES:=$HOME/.dotfiles}"
source "$DOTFILES/scripts/shared.sh"
# Load the shell dotfiles, and then some:
for file in $DOTFILES/config/{exports,alias,functions}; do
for FILENAME in $DOTFILES/config/{exports,alias,functions}; do
HOST="$(hostname -s)"
# global (exports|alias|functions) file for all hosts
# global (exports|alias|functions) FILENAME for all hosts
# shellcheck source=../config/exports
[ -r "$file" ] && source "$file"
# global secret file, git ignored
[ -r "$FILENAME" ] && source "$FILENAME"
# global secret FILENAME, git ignored
# shellcheck source=../config/exports-secret
[ -r "$file-secret" ] && source "$file-secret"
# host specific (exports|alias|functions) file
[ -r "$FILENAME-secret" ] && source "$FILENAME-secret"
# host specific (exports|alias|functions) FILENAME
# shellcheck source=../config/exports
[ -r "$file-$HOST" ] && source "$file-$HOST"
# host specific (exports|alias|functions) file, git ignored
[ -r "$FILENAME-$HOST" ] && source "$FILENAME-$HOST"
# host specific (exports|alias|functions) FILENAME, git ignored
# shellcheck source=../config/exports
[ -r "$file-$HOST-secret" ] && source "$file-$HOST-secret"
[ -r "$FILENAME-$HOST-secret" ] && source "$FILENAME-$HOST-secret"
done