diff options
author | Tuowen Zhao <ztuowen@gmail.com> | 2017-11-12 19:36:24 -0700 |
---|---|---|
committer | Tuowen Zhao <ztuowen@gmail.com> | 2017-11-12 19:36:24 -0700 |
commit | 5e1ad5efbf59a40ef6dc6d404c6f403dff8ed436 (patch) | |
tree | 2c9ab05f372ad5da84662e18a4d7e258b75d3b17 /oh-my-zsh.sh | |
parent | 6bcf7764f8d8094695c7c04bb9532a0ede40ab37 (diff) | |
parent | 41eedd37005f6b3668fcebe2a5f5a26324753519 (diff) | |
download | zsh-5e1ad5efbf59a40ef6dc6d404c6f403dff8ed436.tar.gz zsh-5e1ad5efbf59a40ef6dc6d404c6f403dff8ed436.tar.bz2 zsh-5e1ad5efbf59a40ef6dc6d404c6f403dff8ed436.zip |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'oh-my-zsh.sh')
-rw-r--r-- | oh-my-zsh.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index a7de646f2..7f78e4140 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -93,8 +93,12 @@ done unset config_file # Load the theme -if [ "$ZSH_THEME" = "random" ]; then - themes=($ZSH/themes/*zsh-theme) +if [[ "$ZSH_THEME" == "random" ]]; then + if [[ "${(t)ZSH_THEME_RANDOM_CANDIDATES}" = "array" ]] && [[ "${#ZSH_THEME_RANDOM_CANDIDATES[@]}" -gt 0 ]]; then + themes=($ZSH/themes/${^ZSH_THEME_RANDOM_CANDIDATES}.zsh-theme) + else + themes=($ZSH/themes/*zsh-theme) + fi N=${#themes[@]} ((N=(RANDOM%N)+1)) RANDOM_THEME=${themes[$N]} |