summaryrefslogtreecommitdiff
path: root/oh-my-zsh.sh
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2017-11-01 05:35:37 -0700
committerRobby Russell <robby@planetargon.com>2017-11-01 05:35:37 -0700
commita1d13aa0b4a794c4f10fdd9d69d59ce2d04c3785 (patch)
treea7b6415bc6ec305ec9caa9182eb48f573b7cbc4e /oh-my-zsh.sh
parentd848c94804918138375041a9f800f401bec12068 (diff)
parent5e77e00ad522a5d6a84067d22015b85b0080a19f (diff)
downloadzsh-a1d13aa0b4a794c4f10fdd9d69d59ce2d04c3785.tar.gz
zsh-a1d13aa0b4a794c4f10fdd9d69d59ce2d04c3785.tar.bz2
zsh-a1d13aa0b4a794c4f10fdd9d69d59ce2d04c3785.zip
Merge branch 'Random_Theme_From_List' of https://github.com/Gnouc/oh-my-zsh into Gnouc-Random_Theme_From_List
Diffstat (limited to 'oh-my-zsh.sh')
-rw-r--r--oh-my-zsh.sh8
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]}