Skip to content

Commit 051b85c

Browse files
author
Derek Michael Frank
committed
fix(zsh): Disable wildcard prefix of special ZSH rc files
1 parent b00f261 commit 051b85c

File tree

7 files changed

+31
-33
lines changed

7 files changed

+31
-33
lines changed

README.md

+23-25
Original file line numberDiff line numberDiff line change
@@ -34,48 +34,46 @@ There's a few special files in the hierarchy.
3434
- **bin/**: Anything in `bin/` will get added to your `$PATH` and be made
3535
available everywhere.
3636
- **Brewfile**: This is a list of applications for
37-
[Homebrew Cask](http://caskroom.io) to install: things like Chrome and
38-
1Password and Adium and stuff. Might want to edit this file before
39-
running any initial setup.
37+
[Homebrew Cask](http://caskroom.io) to install: things like Chrome
38+
and 1Password and Adium and stuff. Might want to edit this file
39+
before running any initial setup.
4040
- **topic/\*.zsh**: configuration files
4141
- Environment configuration (i.e., `.zshenv`)
42-
- **topic/\*path.zsh**: Any file ending with `path.zsh` (except
43-
those ending with `fpath.zsh`) is loaded first and is expected
44-
to setup `$PATH` or similar.
45-
- **topic/\*env.zsh**: Any file ending with `env.zsh` is loaded
42+
- **topic/path.zsh**: Any `path.zsh` file is loaded first and
43+
is expected to setup `$PATH` or similar.
44+
- **topic/env.zsh**: Any `env.zsh` file is loaded
4645
second and is expected to setup any additional environment
4746
(e.g., shell options).
4847
- Interactive configuration (i.e., `.zshrc`)
49-
- **topic/\*fpath.zsh**: Any file ending with `fpath.zsh` is
48+
- **topic/fpath.zsh**: Any file ending with `fpath.zsh` is
5049
loaded for interactive shells only. They are expected to
5150
populate `$fpath`.
5251
- **topic/\*.zsh**: Any files ending in `.zsh` (except those
5352
specified elsewhere) are loaded for interactive shells only.
5453
Interactive configuration can include aliases, color output,
5554
prompt configuration, or anything else that should only be
5655
loaded when a user is interacting with Zsh.
57-
- **topic/\*completion.zsh**: Any file ending with
58-
`completion.zsh` is loaded last for interactive shells only.
59-
They are expected to setup autocomplete.
56+
- **topic/*completion.zsh**: Any `completion.zsh` file is
57+
loaded last for interactive shells only. They are expected
58+
to setup autocomplete.
6059
- Login configuration (i.e., `.zprofile`, `.zlogin`, `.zlogout`)
61-
- **topic/\*profile.zsh**: Any file ending with `profile.zsh` is
62-
loaded for login shells only. Unlike `.zlogin`, these files
63-
are loaded before the interactive files above are loaded.
64-
- **topic/\*login.zsh**: Any file ending in `login.zsh` is
65-
loaded for login shells only. Unlike `.zprofile`, they are
66-
loaded after your interactive files are loaded above. This is
67-
the ideal place to put anything you want to see when you start
68-
up a new login shell (e.g., cowsay, date, todo, fortune).
69-
- **topic/\*logout.zsh**: Any file ending in `logout.zsh` is
70-
loaded for login shells only and only when you exit/logout the
71-
shell.
60+
- **topic/profile.zsh**: Any `profile.zsh` file is loaded for
61+
login shells only. Unlike `.zlogin`, these files are loaded
62+
before the interactive files above are loaded.
63+
- **topic/login.zsh**: Any `login.zsh` file is loaded for login
64+
shells only. Unlike `.zprofile`, they are loaded after your
65+
interactive files are loaded above. This is the ideal place
66+
to put anything you want to see when you start up a new login
67+
shell (e.g., cowsay, date, todo, fortune).
68+
- **topic/logout.zsh**: Any `logout.zsh` file is loaded for
69+
login shells only and only when you exit/logout the shell.
7270
- **topic/install.sh**: Any file named `install.sh` is executed when you
7371
run `script/install`. To avoid being loaded automatically, its
7472
extension is `.sh`, not `.zsh`.
7573
- **topic/\*.symlink**: Any files ending in `*.symlink` get symlinked into
76-
your `$HOME`. This is so you can keep all of those versioned in your dotfiles
77-
but still keep those autoloaded files in your home directory. These get
78-
symlinked in when you run `script/bootstrap`.
74+
your `$HOME`. This is so you can keep all of those versioned in your
75+
dotfiles but still keep those autoloaded files in your home
76+
directory. These get symlinked in when you run `script/bootstrap`.
7977

8078
## install
8179

File renamed without changes.

zsh/zlogin.symlink

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ setopt nullglob
55

66
# all of our login zsh files
77
typeset -U login_files
8-
login_files=($DOTFILES/**/*login.zsh)
8+
login_files=($DOTFILES/**/login.zsh)
99

1010
# run all login files
1111
for file in ${login_files}; do

zsh/zlogout.symlink

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ setopt nullglob
33

44
# all of our logout zsh files
55
typeset -U logout_files
6-
logout_files=($DOTFILES/**/*logout.zsh)
6+
logout_files=($DOTFILES/**/logout.zsh)
77

88
# run all logout files
99
for file in ${logout_files}; do

zsh/zprofile.symlink

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ setopt nullglob
55

66
# all of our profile zsh files
77
typeset -U profile_files
8-
profile_files=($DOTFILES/**/*profile.zsh)
8+
profile_files=($DOTFILES/**/profile.zsh)
99

1010
# run all profile files
1111
for file in ${profile_files}; do

zsh/zshenv.symlink

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ export PROJECTS="$HOME/Code"
99

1010
# path and env zsh files
1111
typeset -U path_files env_files
12-
path_files=($DOTFILES/**/*path.zsh~**/*fpath.zsh)
13-
env_files=($DOTFILES/**/*env.zsh)
12+
path_files=($DOTFILES/**/path.zsh~**/fpath.zsh)
13+
env_files=($DOTFILES/**/env.zsh)
1414

1515
# load the path files
1616
for file in ${path_files}; do

zsh/zshrc.symlink

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ fi
1111

1212
# all of our non-path/env/profile/login/logout zsh files
1313
typeset -U fpath_files interactive_files completion_files
14-
fpath_files=($DOTFILES/**/*fpath.zsh)
15-
interactive_files=($DOTFILES/**/*.zsh~**/*completion.zsh~**/*path.zsh~**/*env.zsh~**/*profile.zsh~**/*login.zsh~**/*logout.zsh)
16-
completion_files=($DOTFILES/**/*completion.zsh)
14+
fpath_files=($DOTFILES/**/fpath.zsh)
15+
interactive_files=($DOTFILES/**/*.zsh~**/completion.zsh~**/path.zsh~**/env.zsh~**/profile.zsh~**/fpath.zsh~**/login.zsh~**/logout.zsh)
16+
completion_files=($DOTFILES/**/completion.zsh)
1717

1818
# load fpath config files
1919
for file in ${fpath_files}; do

0 commit comments

Comments
 (0)