diff options
| author | Willy Weiskopf <william@weiskopf.me> | 2014-07-16 22:21:09 -0600 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2020-02-19 18:20:28 +0100 |
| commit | 6adad5c300a6bfde33b593489cc1c3b645b721e8 (patch) | |
| tree | ffc272716a4fce2ed12c4b833ff772a5f2e8067a /plugins/themes | |
| parent | d76258ff554ea58d9865b9864f5fff1dd8d2e4bb (diff) | |
| download | zsh-6adad5c300a6bfde33b593489cc1c3b645b721e8.tar.gz zsh-6adad5c300a6bfde33b593489cc1c3b645b721e8.tar.bz2 zsh-6adad5c300a6bfde33b593489cc1c3b645b721e8.zip | |
Move random theme functionality into "random" theme
The statements for selecting a random theme in oh-my-zsh.sh and the themes
plugin are duplicate. Most people eventually settle on a theme, making those
lines in oh-my-zsh.sh superfluous. To address those, it may makes sense to put
the random theme functionality into a theme of its own (since themes are just
zsh scripts.
Diffstat (limited to 'plugins/themes')
| -rw-r--r-- | plugins/themes/themes.plugin.zsh | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/plugins/themes/themes.plugin.zsh b/plugins/themes/themes.plugin.zsh index 2cd0ee327..ac4ccc980 100644 --- a/plugins/themes/themes.plugin.zsh +++ b/plugins/themes/themes.plugin.zsh @@ -1,19 +1,17 @@ function theme { - if [ -z "$1" ] || [ "$1" = "random" ]; then - themes=($ZSH/themes/*zsh-theme) - N=${#themes[@]} - ((N=(RANDOM%N)+1)) - RANDOM_THEME=${themes[$N]} - source "$RANDOM_THEME" - echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..." + if [ -z "$1" ]; then + 1="random" + fi + + if [ -f "$ZSH_CUSTOM/$1.zsh-theme" ] + then + source "$ZSH_CUSTOM/$1.zsh-theme" + elif [ -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ] + then + source "$ZSH_CUSTOM/themes/$1.zsh-theme" else - if [ -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ] - then - source "$ZSH_CUSTOM/themes/$1.zsh-theme" - else - source "$ZSH/themes/$1.zsh-theme" - fi + source "$ZSH/themes/$1.zsh-theme" fi } |