diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2020-08-28 10:02:23 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2020-08-28 10:02:23 -0600 |
| commit | 8620d4004c3391fa4f624ebf500eef8bcf32a52e (patch) | |
| tree | c8d6dcc080733bf63aec4acaf3257a7400da1bb3 /lib | |
| parent | f672613e98ba6b30728517b22c0e378557d7fb81 (diff) | |
| parent | 8d08f1634a7b9782e3722ce770e8630f569afe3f (diff) | |
| download | zsh-8620d4004c3391fa4f624ebf500eef8bcf32a52e.tar.gz zsh-8620d4004c3391fa4f624ebf500eef8bcf32a52e.tar.bz2 zsh-8620d4004c3391fa4f624ebf500eef8bcf32a52e.zip | |
Merge remote-tracking branch 'origin/master' into master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cli.zsh | 1 | ||||
| -rw-r--r-- | lib/functions.zsh | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/cli.zsh b/lib/cli.zsh index 3c09cdab8..c1ae2bdf2 100644 --- a/lib/cli.zsh +++ b/lib/cli.zsh @@ -201,6 +201,7 @@ function _omz::pr::test { } function _omz::update { + # Run update script env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh" # Update last updated file zmodload zsh/datetime diff --git a/lib/functions.zsh b/lib/functions.zsh index e85b867a5..4bc533b7a 100644 --- a/lib/functions.zsh +++ b/lib/functions.zsh @@ -7,8 +7,17 @@ function uninstall_oh_my_zsh() { } function upgrade_oh_my_zsh() { - echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color" - omz update + if (( $+functions[_omz::update] )); then + echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color" + 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" } function take() { |