From bc9d4b89bb3985a250e5a702a0f2d76a8632cd8a Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Fri, 18 Sep 2020 19:34:17 +0200 Subject: Remove racially-charged language from the codebase The ZSH_THEME_RANDOM_BLACKLIST variable will be deprecated until it's removed 2 months from now. --- themes/random.zsh-theme | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'themes/random.zsh-theme') diff --git a/themes/random.zsh-theme b/themes/random.zsh-theme index 6cb7cc579..85a8612b7 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 -- cgit v1.2.3-70-g09d2 From 93c837fec8e9fe61509b9dff9e909e84f7ebe32d Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Sun, 20 Sep 2020 13:41:21 +0200 Subject: random: add ZSH_THEME_RANDOM_QUIET setting Fixes #9180 Co-authored-by: James Eapen --- themes/random.zsh-theme | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'themes/random.zsh-theme') diff --git a/themes/random.zsh-theme b/themes/random.zsh-theme index 85a8612b7..f0b8e5c18 100644 --- a/themes/random.zsh-theme +++ b/themes/random.zsh-theme @@ -42,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 -- cgit v1.2.3-70-g09d2