From 068b845b6c873ef70635a18b4809805eb11b9796 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 9 Aug 2024 11:14:14 -0400 Subject: [PATCH] Refactor to correct with linter --- zsh/zshenv | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/zsh/zshenv b/zsh/zshenv index 3fdabcd..bdfb6a8 100644 --- a/zsh/zshenv +++ b/zsh/zshenv @@ -67,18 +67,28 @@ ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=7" typeset -gU path path=( - $HOME/.cargo/bin/ - $HOME/.scripts/ - $HOME/.emacs.d/bin/ - $HOME/.yarn/bin/ - $HOME/.config/yarn/global/node_modules/.bin/ - $HOME/.local/bin/ - $path) + "$HOME/.cargo/bin/" + "$HOME/.scripts/" + "$HOME/.emacs.d/bin/" + "$HOME/.yarn/bin/" + "$HOME/.config/yarn/global/node_modules/.bin/" + "$HOME/.local/bin/" + "$path") # This will load the specified zsh files if they exist in the $ZDIR/environment directory. # It will load based on hostname & uname. env_loader(){ - [ -e ${ZDIR}/environment/os/$OSTYPE/$1 ] && source ${ZDIR}/environment/os/$OSTYPE/$1 - [ -e ${ZDIR}/environment/host/$HOST/$1 ] && source ${ZDIR}/environment/host/$HOST/$1 + if [ $# -ne 1 ]; then + echo "Usage: env_loader file" + return 1 + fi + + if [ -e "${ZDIR}/environment/os/$OSTYPE/$1" ]; then + source "${ZDIR}/environment/os/$OSTYPE/$1" + fi + if [ -e "${ZDIR}/environment/host/$HOST/$1" ] ; then + source "${ZDIR}/environment/host/$HOST/$1" + fi } + env_loader zshenv