diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2020-02-19 20:26:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-19 20:26:45 +0100 |
| commit | bc9fe7423f5d8c639b208ebb9a7dbfce078bfd9b (patch) | |
| tree | 66b959555d5227f0f9889c5347eb513a266bce22 /oh-my-zsh.sh | |
| parent | d76258ff554ea58d9865b9864f5fff1dd8d2e4bb (diff) | |
| parent | 3d4890dcc07478e7129de1e79afedafd3f08ffbc (diff) | |
| download | zsh-bc9fe7423f5d8c639b208ebb9a7dbfce078bfd9b.tar.gz zsh-bc9fe7423f5d8c639b208ebb9a7dbfce078bfd9b.tar.bz2 zsh-bc9fe7423f5d8c639b208ebb9a7dbfce078bfd9b.zip | |
Merge pull request #8651 from mcornella/random-theme-refactor
Add random theme and consolidate logic from init and themes plugin
Diffstat (limited to 'oh-my-zsh.sh')
| -rw-r--r-- | oh-my-zsh.sh | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index c3fae6efb..30259372c 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -97,25 +97,12 @@ done unset config_file # Load the 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) +if [ ! "$ZSH_THEME" = "" ]; then + if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]; then + source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" + elif [ -f "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" ]; then + source "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" else - themes=($ZSH/themes/*zsh-theme) - fi - N=${#themes[@]} - ((N=(RANDOM%N)+1)) - RANDOM_THEME=${themes[$N]} - source "$RANDOM_THEME" - echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..." -else - if [ ! "$ZSH_THEME" = "" ]; then - if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]; then - source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" - elif [ -f "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" ]; then - source "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" - else - source "$ZSH/themes/$ZSH_THEME.zsh-theme" - fi + source "$ZSH/themes/$ZSH_THEME.zsh-theme" fi fi |