linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-19 20:29:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix upgrade_oh_my_zsh function deprecation

Browse source
This commit is contained in:
Marc Cornellà 2020-08-17 22:11:02 +02:00
parent 613045e7e5
commit 7deda85f8c
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/cli.zsh
View file

@ -201,10 +201,14 @@ function _omz::pr::test {
} }
function _omz::update { function _omz::update {
# Run update script
env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh" env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
# Update last updated file # Update last updated file
zmodload zsh/datetime zmodload zsh/datetime
echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update" echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
# Remove update lock if it exists # Remove update lock if it exists
command rm -rf "$ZSH/log/update.lock" command rm -rf "$ZSH/log/update.lock"
# Restart the zsh session
_omz::log info "restarting the zsh session..."
[[ -z "$SHELL" ]] && exec ${SHELL#-} || exec zsh
} }

14
lib/functions.zsh
View file

@ -7,8 +7,20 @@ function uninstall_oh_my_zsh() {
} }
function upgrade_oh_my_zsh() { function upgrade_oh_my_zsh() {
if (( $+functions[_omz::update] )); then
echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color" echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color"
omz update fi
# Run update script
env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
# Update last updated file
zmodload zsh/datetime
echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
# Remove update lock if it exists
command rm -rf "$ZSH/log/update.lock"
# Restart the zsh session
_omz::log info "restarting the zsh session..."
[[ -z "$SHELL" ]] && exec ${SHELL#-} || exec zsh
} }
function take() { function take() {