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
Ohmyzsh
Commits
de8299d6
Commit
de8299d6
authored
Nov 02, 2015
by
Chao Du
Committed by
Marc Cornellà
Jun 15, 2018
Browse files
Fixed Issue #4550: Move ~/.zsh-update file to $ZSH_CACHE_DIR
parent
e96ca345
Changes
2
Hide whitespace changes
Inline
Side-by-side
oh-my-zsh.sh
View file @
de8299d6
# Set ZSH_CACHE_DIR to the path where cache files should be created
# or else we will use the default cache/
if
[[
-z
"
$ZSH_CACHE_DIR
"
]]
;
then
ZSH_CACHE_DIR
=
"
$ZSH
/cache"
fi
# Check for updates on initial load...
# Check for updates on initial load...
if
[
"
$DISABLE_AUTO_UPDATE
"
!=
"true"
]
;
then
if
[
"
$DISABLE_AUTO_UPDATE
"
!=
"true"
]
;
then
env
ZSH
=
$ZSH
DISABLE_UPDATE_PROMPT
=
$DISABLE_UPDATE_PROMPT
zsh
-f
$ZSH
/tools/check_for_upgrade.sh
env
ZSH
=
$ZSH
ZSH_CACHE_DIR
=
$ZSH_CACHE_DIR
DISABLE_UPDATE_PROMPT
=
$DISABLE_UPDATE_PROMPT
zsh
-f
$ZSH
/tools/check_for_upgrade.sh
fi
fi
# Initializes Oh My Zsh
# Initializes Oh My Zsh
...
@@ -17,12 +23,6 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
...
@@ -17,12 +23,6 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
ZSH_CUSTOM
=
"
$ZSH
/custom"
ZSH_CUSTOM
=
"
$ZSH
/custom"
fi
fi
# Set ZSH_CACHE_DIR to the path where cache files should be created
# or else we will use the default cache/
if
[[
-z
"
$ZSH_CACHE_DIR
"
]]
;
then
ZSH_CACHE_DIR
=
"
$ZSH
/cache"
fi
# Load all of the config files in ~/oh-my-zsh that end in .zsh
# Load all of the config files in ~/oh-my-zsh that end in .zsh
# TIP: Add files you don't want in git to .gitignore
# TIP: Add files you don't want in git to .gitignore
...
...
tools/check_for_upgrade.sh
View file @
de8299d6
...
@@ -7,7 +7,7 @@ function _current_epoch() {
...
@@ -7,7 +7,7 @@ function _current_epoch() {
}
}
function
_update_zsh_update
()
{
function
_update_zsh_update
()
{
echo
"LAST_EPOCH=
$(
_current_epoch
)
"
>!
~
/.zsh-update
echo
"LAST_EPOCH=
$(
_current_epoch
)
"
>!
${
ZSH_CACHE_DIR
}
/.zsh-update
}
}
function
_upgrade_zsh
()
{
function
_upgrade_zsh
()
{
...
@@ -30,11 +30,11 @@ fi
...
@@ -30,11 +30,11 @@ fi
whence git
>
/dev/null
||
return
0
whence git
>
/dev/null
||
return
0
if
mkdir
"
$ZSH
/log/update.lock"
2>/dev/null
;
then
if
mkdir
"
$ZSH
/log/update.lock"
2>/dev/null
;
then
if
[
-f
~
/.zsh-update
]
;
then
if
[
-f
${
ZSH_CACHE_DIR
}
/.zsh-update
]
;
then
.
~
/.zsh-update
.
${
ZSH_CACHE_DIR
}
/.zsh-update
if
[[
-z
"
$LAST_EPOCH
"
]]
;
then
if
[[
-z
"
$LAST_EPOCH
"
]]
;
then
_update_zsh_update
&&
return
0
;
_update_zsh_update
&&
return
0
fi
fi
epoch_diff
=
$((
$(
_current_epoch
)
-
$LAST_EPOCH
))
epoch_diff
=
$((
$(
_current_epoch
)
-
$LAST_EPOCH
))
...
...
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