diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2020-09-24 15:02:36 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2020-09-24 15:02:36 -0600 |
| commit | 2b3d602644a13aa97391f22ecfc249b6bc58dd49 (patch) | |
| tree | 89bed339def1ab58d1ea1b16593752d4a29e23fa /themes/random.zsh-theme | |
| parent | 44cc53902935c693239611b06de02fc37ac4da62 (diff) | |
| parent | 93c837fec8e9fe61509b9dff9e909e84f7ebe32d (diff) | |
| download | zsh-2b3d602644a13aa97391f22ecfc249b6bc58dd49.tar.gz zsh-2b3d602644a13aa97391f22ecfc249b6bc58dd49.tar.bz2 zsh-2b3d602644a13aa97391f22ecfc249b6bc58dd49.zip | |
Merge remote-tracking branch 'origin/master' into master
Diffstat (limited to 'themes/random.zsh-theme')
| -rw-r--r-- | themes/random.zsh-theme | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/themes/random.zsh-theme b/themes/random.zsh-theme index 6cb7cc579..f0b8e5c18 100644 --- a/themes/random.zsh-theme +++ b/themes/random.zsh-theme @@ -1,3 +1,10 @@ +# Deprecate ZSH_THEME_RANDOM_BLACKLIST +if [[ -n "$ZSH_THEME_RANDOM_BLACKLIST" ]]; then + echo '[oh-my-zsh] ZSH_THEME_RANDOM_BLACKLIST is deprecated. Use `ZSH_THEME_RANDOM_IGNORED` instead.' + ZSH_THEME_RANDOM_IGNORED=($ZSH_THEME_RANDOM_BLACKLIST) + unset ZSH_THEME_RANDOM_BLACKLIST +fi + # Make themes a unique array typeset -Ua themes @@ -11,8 +18,8 @@ else "$ZSH_CUSTOM"/themes/*.zsh-theme(N:t:r) "$ZSH"/themes/*.zsh-theme(N:t:r) ) - # Remove blacklisted themes from the list - for theme in random ${ZSH_THEME_RANDOM_BLACKLIST[@]}; do + # Remove ignored themes from the list + for theme in random ${ZSH_THEME_RANDOM_IGNORED[@]}; do themes=("${(@)themes:#$theme}") done fi @@ -35,4 +42,6 @@ else return 1 fi -echo "[oh-my-zsh] Random theme '${RANDOM_THEME}' loaded" +if [[ -z "$ZSH_THEME_RANDOM_QUIET" ]]; then + echo "[oh-my-zsh] Random theme '${RANDOM_THEME}' loaded" +fi |