diff --git a/local/bin/x-load-configs b/local/bin/x-load-configs new file mode 100755 index 0000000..1ce5f1e --- /dev/null +++ b/local/bin/x-load-configs @@ -0,0 +1,22 @@ +#!/usr/bin/env bash +# Load our configuration files +# Copyright (c) 2023 Ismo Vuorinen. All Rights Reserved. + +: "${DOTFILES:=$HOME/.dotfiles}" + +# Load the shell dotfiles, and then some: +for file in $DOTFILES/config/{exports,alias,functions}; do + HOST="$(hostname -s)" + # global (exports|alias|functions) file for all hosts + # shellcheck source=../config/exports + [ -r "$file" ] && source "$file" + # global secret file, git ignored + # shellcheck source=../config/exports-secret + [ -r "$file-secret" ] && source "$file-secret" + # host specific (exports|alias|functions) file + # shellcheck source=../config/exports + [ -r "$file-$HOST" ] && source "$file-$HOST" + # host specific (exports|alias|functions) file, git ignored + # shellcheck source=../config/exports + [ -r "$file-$HOST-secret" ] && source "$file-$HOST-secret" +done diff --git a/scripts/shared.sh b/scripts/shared.sh index 78edfe8..8eaf3c5 100755 --- a/scripts/shared.sh +++ b/scripts/shared.sh @@ -8,27 +8,6 @@ source "$DOTFILES/local/bin/msgr" -# Run x-load-configs in your terminal to reload the files. -function x-load-configs() -{ - # Load the shell dotfiles, and then some: - for file in $DOTFILES/config/{exports,alias,functions}; do - HOST="$(hostname -s)" - # global (exports|alias|functions) file for all hosts - # shellcheck source=../config/exports - [ -r "$file" ] && source "$file" - # global secret file, git ignored - # shellcheck source=../config/exports-secret - [ -r "$file-secret" ] && source "$file-secret" - # host specific (exports|alias|functions) file - # shellcheck source=../config/exports - [ -r "$file-$HOST" ] && source "$file-$HOST" - # host specific (exports|alias|functions) file, git ignored - # shellcheck source=../config/exports - [ -r "$file-$HOST-secret" ] && source "$file-$HOST-secret" - done -} - # -- Menu builder -- # function menu_section() {