From fabc467594ea3c5c3fe9ebd5eb0ffc96f6792447 Mon Sep 17 00:00:00 2001 From: okertanov Date: Sun, 5 Jun 2011 02:05:07 +0300 Subject: [PATCH 1/2] fix script return when DISABLE_AUTO_UPDATE is true --- oh-my-zsh.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index 2157c38a0..d72d90cf9 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -1,8 +1,6 @@ # Check for updates on initial load... -if [ "$DISABLE_AUTO_UPDATE" = "true" ] +if [ "$DISABLE_AUTO_UPDATE" != "true" ] then - return -else /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh fi From 014e8fdaed43dbf78350d4c9e64a44b2435ae3d7 Mon Sep 17 00:00:00 2001 From: okertanov Date: Sun, 5 Jun 2011 18:00:22 +0300 Subject: [PATCH 2/2] fix no such file or directory message when ZSH_THEME isn't set. --- oh-my-zsh.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index d72d90cf9..af4b13e7d 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -43,6 +43,9 @@ then source "$RANDOM_THEME" echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..." else - source "$ZSH/themes/$ZSH_THEME.zsh-theme" + if [ ! -z "$ZSH_THEME" ] + then + source "$ZSH/themes/$ZSH_THEME.zsh-theme" + fi fi