diff options
| author | Robby Russell <robby@planetargon.com> | 2013-11-24 10:36:50 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2013-11-24 10:36:50 -0800 |
| commit | fabe23bbfc4d5df85a07bb4fc8104a9eaf3cb097 (patch) | |
| tree | 0dfb37187a79ed340781cc04bfd572c9dfc99b5c | |
| parent | 370ccc359d8115de64088d96c26f358ecbaa45e4 (diff) | |
| parent | 81192343568b924c901e260f7b6beda887e43fff (diff) | |
| download | zsh-fabe23bbfc4d5df85a07bb4fc8104a9eaf3cb097.tar.gz zsh-fabe23bbfc4d5df85a07bb4fc8104a9eaf3cb097.tar.bz2 zsh-fabe23bbfc4d5df85a07bb4fc8104a9eaf3cb097.zip | |
Merge pull request #2259 from eddiemonge/patch-1
standardize logic blocks
| -rw-r--r-- | oh-my-zsh.sh | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index 15c1dce44..2ae07668c 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -1,6 +1,5 @@ # Check for updates on initial load... -if [ "$DISABLE_AUTO_UPDATE" != "true" ] -then +if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh $ZSH/tools/check_for_upgrade.sh fi @@ -69,8 +68,7 @@ done unset config_file # Load the theme -if [ "$ZSH_THEME" = "random" ] -then +if [ "$ZSH_THEME" = "random" ]; then themes=($ZSH/themes/*zsh-theme) N=${#themes[@]} ((N=(RANDOM%N)+1)) @@ -78,13 +76,10 @@ then 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 + 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 + 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" |