Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Oh My Zsh
Commits
fabe23bb
Commit
fabe23bb
authored
Nov 24, 2013
by
Robby Russell
Browse files
Merge pull request #2259 from eddiemonge/patch-1
standardize logic blocks
parents
370ccc35
81192343
Changes
1
Show whitespace changes
Inline
Side-by-side
oh-my-zsh.sh
View file @
fabe23bb
# Check for updates on initial load...
# Check for updates on initial load...
if
[
"
$DISABLE_AUTO_UPDATE
"
!=
"true"
]
if
[
"
$DISABLE_AUTO_UPDATE
"
!=
"true"
]
;
then
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
...
@@ -69,8 +68,7 @@ done
unset
config_file
unset
config_file
# Load the theme
# Load the theme
if
[
"
$ZSH_THEME
"
=
"random"
]
if
[
"
$ZSH_THEME
"
=
"random"
]
;
then
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
...
@@ -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
"
=
""
]
if
[
!
"
$ZSH_THEME
"
=
""
]
;
then
then
if
[
-f
"
$ZSH_CUSTOM
/
$ZSH_THEME
.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"
]
elif
[
-f
"
$ZSH_CUSTOM
/themes/
$ZSH_THEME
.zsh-theme"
]
;
then
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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment