From 5d2e6a0418cc25bb2ff8812af48fe29f0d222584 Mon Sep 17 00:00:00 2001 From: mattdodge Date: Tue, 6 Nov 2018 10:21:35 -0800 Subject: [PATCH 1/2] Ignore zsh files in test folders --- zsh/zshrc.symlink | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index 9ce55833097..0ebcde3967d 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -15,6 +15,8 @@ fi # all of our zsh files typeset -U config_files config_files=($ZSH/**/*.zsh) +# Ignore anything in a tests folder +config_files=(${config_files:#*/test?/*}) # load the path files for file in ${(M)config_files:#*/path.zsh} From 4f0e25723e3543c62bc62126047b1675e30b1103 Mon Sep 17 00:00:00 2001 From: mattdodge Date: Fri, 9 Nov 2018 11:38:05 -0800 Subject: [PATCH 2/2] Only include top level topic directory zsh files --- README.md | 2 +- zsh/zshrc.symlink | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9e73facfd0c..22dcd41f3d9 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ There's a few special files in the hierarchy. available everywhere. - **Brewfile**: This is a list of applications for [Homebrew Cask](https://caskroom.github.io) to install: things like Chrome and 1Password and Adium and stuff. Might want to edit this file before running any initial setup. - **topic/\*.zsh**: Any files ending in `.zsh` get loaded into your - environment. + environment. Note these files will only be loaded if they are in a top-level topic folder. - **topic/path.zsh**: Any file named `path.zsh` is loaded first and is expected to setup `$PATH` or similar. - **topic/completion.zsh**: Any file named `completion.zsh` is loaded diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index 0ebcde3967d..1f6026c0ab4 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -14,9 +14,7 @@ fi # all of our zsh files typeset -U config_files -config_files=($ZSH/**/*.zsh) -# Ignore anything in a tests folder -config_files=(${config_files:#*/test?/*}) +config_files=($ZSH/*/*.zsh) # load the path files for file in ${(M)config_files:#*/path.zsh}