浏览代码

Merge pull request #2259 from eddiemonge/patch-1

standardize logic blocks
Robby Russell 11 年之前
父节点
当前提交
fabe23bbfc
共有 1 个文件被更改,包括 5 次插入10 次删除
  1. 5 10
      oh-my-zsh.sh

+ 5 - 10
oh-my-zsh.sh

@@ -1,6 +1,5 @@
 # Check for updates on initial load...
 # 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
   /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh $ZSH/tools/check_for_upgrade.sh
 fi
 fi
 
 
@@ -69,8 +68,7 @@ done
 unset config_file
 unset config_file
 
 
 # Load the theme
 # Load the theme
-if [ "$ZSH_THEME" = "random" ]
-then
+if [ "$ZSH_THEME" = "random" ]; then
   themes=($ZSH/themes/*zsh-theme)
   themes=($ZSH/themes/*zsh-theme)
   N=${#themes[@]}
   N=${#themes[@]}
   ((N=(RANDOM%N)+1))
   ((N=(RANDOM%N)+1))
@@ -78,13 +76,10 @@ then
   source "$RANDOM_THEME"
   source "$RANDOM_THEME"
   echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."
   echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."
 else
 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"
       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"
       source "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme"
     else
     else
       source "$ZSH/themes/$ZSH_THEME.zsh-theme"
       source "$ZSH/themes/$ZSH_THEME.zsh-theme"