mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-18 03:40:08 +00:00
fix(updater): correctly restart the zsh session when the update pulled changes
This commit is contained in:
Marc Cornellà
parent
889cd7acf3
commit
e093a4cf62
2 changed files with 239 additions and 227 deletions
460
lib/cli.zsh
460
lib/cli.zsh
|
|
@ -1,22 +1,22 @@
|
||||||
#!/usr/bin/env zsh
|
#!/usr/bin/env zsh
|
||||||
|
|
||||||
function omz {
|
function omz {
|
||||||
[[ $# -gt 0 ]] || {
|
[[ $# -gt 0 ]] || {
|
||||||
_omz::help
|
_omz::help
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
local command="$1"
|
local command="$1"
|
||||||
shift
|
shift
|
||||||
|
|
||||||
# Subcommand functions start with _ so that they don't
|
# Subcommand functions start with _ so that they don't
|
||||||
# appear as completion entries when looking for `omz`
|
# appear as completion entries when looking for `omz`
|
||||||
(( $+functions[_omz::$command] )) || {
|
(( $+functions[_omz::$command] )) || {
|
||||||
_omz::help
|
_omz::help
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
_omz::$command "$@"
|
_omz::$command "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
function _omz {
|
function _omz {
|
||||||
|
|
@ -69,292 +69,298 @@ EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
function _omz::confirm {
|
function _omz::confirm {
|
||||||
# If question supplied, ask it before reading the answer
|
# If question supplied, ask it before reading the answer
|
||||||
# NOTE: uses the logname of the caller function
|
# NOTE: uses the logname of the caller function
|
||||||
if [[ -n "$1" ]]; then
|
if [[ -n "$1" ]]; then
|
||||||
_omz::log prompt "$1" "${${functrace[1]#_}%:*}"
|
_omz::log prompt "$1" "${${functrace[1]#_}%:*}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Read one character
|
# Read one character
|
||||||
read -r -k 1
|
read -r -k 1
|
||||||
|
|
||||||
# If no newline entered, add a newline
|
# If no newline entered, add a newline
|
||||||
if [[ "$REPLY" != $'\n' ]]; then
|
if [[ "$REPLY" != $'\n' ]]; then
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function _omz::log {
|
function _omz::log {
|
||||||
# if promptsubst is set, a message with `` or $()
|
# if promptsubst is set, a message with `` or $()
|
||||||
# will be run even if quoted due to `print -P`
|
# will be run even if quoted due to `print -P`
|
||||||
setopt localoptions nopromptsubst
|
setopt localoptions nopromptsubst
|
||||||
|
|
||||||
# $1 = info|warn|error|debug
|
# $1 = info|warn|error|debug
|
||||||
# $2 = text
|
# $2 = text
|
||||||
# $3 = (optional) name of the logger
|
# $3 = (optional) name of the logger
|
||||||
|
|
||||||
local logtype=$1
|
local logtype=$1
|
||||||
local logname=${3:-${${functrace[1]#_}%:*}}
|
local logname=${3:-${${functrace[1]#_}%:*}}
|
||||||
|
|
||||||
# Don't print anything if debug is not active
|
# Don't print anything if debug is not active
|
||||||
if [[ $logtype = debug && -z $_OMZ_DEBUG ]]; then
|
if [[ $logtype = debug && -z $_OMZ_DEBUG ]]; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Choose coloring based on log type
|
# Choose coloring based on log type
|
||||||
case "$logtype" in
|
case "$logtype" in
|
||||||
prompt) print -Pn "%S%F{blue}$logname%f%s: $2" ;;
|
prompt) print -Pn "%S%F{blue}$logname%f%s: $2" ;;
|
||||||
debug) print -P "%F{white}$logname%f: $2" ;;
|
debug) print -P "%F{white}$logname%f: $2" ;;
|
||||||
info) print -P "%F{green}$logname%f: $2" ;;
|
info) print -P "%F{green}$logname%f: $2" ;;
|
||||||
warn) print -P "%S%F{yellow}$logname%f%s: $2" ;;
|
warn) print -P "%S%F{yellow}$logname%f%s: $2" ;;
|
||||||
error) print -P "%S%F{red}$logname%f%s: $2" ;;
|
error) print -P "%S%F{red}$logname%f%s: $2" ;;
|
||||||
esac >&2
|
esac >&2
|
||||||
}
|
}
|
||||||
|
|
||||||
function _omz::plugin {
|
function _omz::plugin {
|
||||||
(( $# > 0 && $+functions[_omz::plugin::$1] )) || {
|
(( $# > 0 && $+functions[_omz::plugin::$1] )) || {
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
Usage: omz plugin <command> [options]
|
Usage: omz plugin <command> [options]
|
||||||
|
|
||||||
Available commands:
|
Available commands:
|
||||||
|
|
||||||
list List all available Oh My Zsh plugins
|
list List all available Oh My Zsh plugins
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
local command="$1"
|
local command="$1"
|
||||||
shift
|
shift
|
||||||
|
|
||||||
_omz::plugin::$command "$@"
|
_omz::plugin::$command "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
function _omz::plugin::list {
|
function _omz::plugin::list {
|
||||||
local -a custom_plugins builtin_plugins
|
local -a custom_plugins builtin_plugins
|
||||||
custom_plugins=("$ZSH_CUSTOM"/plugins/*(-/N:t))
|
custom_plugins=("$ZSH_CUSTOM"/plugins/*(-/N:t))
|
||||||
builtin_plugins=("$ZSH"/plugins/*(-/N:t))
|
builtin_plugins=("$ZSH"/plugins/*(-/N:t))
|
||||||
|
|
||||||
# If the command is being piped, print all found line by line
|
# If the command is being piped, print all found line by line
|
||||||
if [[ ! -t 1 ]]; then
|
if [[ ! -t 1 ]]; then
|
||||||
print -l ${(q-)custom_plugins} ${(q-)builtin_plugins}
|
print -l ${(q-)custom_plugins} ${(q-)builtin_plugins}
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if (( ${#custom_plugins} )); then
|
if (( ${#custom_plugins} )); then
|
||||||
print -P "%U%BCustom plugins%b%u:"
|
print -P "%U%BCustom plugins%b%u:"
|
||||||
print -l ${(q-)custom_plugins} | column
|
print -l ${(q-)custom_plugins} | column
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if (( ${#builtin_plugins} )); then
|
if (( ${#builtin_plugins} )); then
|
||||||
(( ${#custom_plugins} )) && echo # add a line of separation
|
(( ${#custom_plugins} )) && echo # add a line of separation
|
||||||
|
|
||||||
print -P "%U%BBuilt-in plugins%b%u:"
|
print -P "%U%BBuilt-in plugins%b%u:"
|
||||||
print -l ${(q-)builtin_plugins} | column
|
print -l ${(q-)builtin_plugins} | column
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function _omz::pr {
|
function _omz::pr {
|
||||||
(( $# > 0 && $+functions[_omz::pr::$1] )) || {
|
(( $# > 0 && $+functions[_omz::pr::$1] )) || {
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
Usage: omz pr <command> [options]
|
Usage: omz pr <command> [options]
|
||||||
|
|
||||||
Available commands:
|
Available commands:
|
||||||
|
|
||||||
clean Delete all PR branches (ohmyzsh/pull-*)
|
clean Delete all PR branches (ohmyzsh/pull-*)
|
||||||
test <PR_number_or_URL> Fetch PR #NUMBER and rebase against master
|
test <PR_number_or_URL> Fetch PR #NUMBER and rebase against master
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
local command="$1"
|
local command="$1"
|
||||||
shift
|
shift
|
||||||
|
|
||||||
_omz::pr::$command "$@"
|
_omz::pr::$command "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
function _omz::pr::clean {
|
function _omz::pr::clean {
|
||||||
(
|
(
|
||||||
set -e
|
set -e
|
||||||
builtin cd -q "$ZSH"
|
builtin cd -q "$ZSH"
|
||||||
|
|
||||||
# Check if there are PR branches
|
# Check if there are PR branches
|
||||||
local fmt branches
|
local fmt branches
|
||||||
fmt="%(color:bold blue)%(align:18,right)%(refname:short)%(end)%(color:reset) %(color:dim bold red)%(objectname:short)%(color:reset) %(color:yellow)%(contents:subject)"
|
fmt="%(color:bold blue)%(align:18,right)%(refname:short)%(end)%(color:reset) %(color:dim bold red)%(objectname:short)%(color:reset) %(color:yellow)%(contents:subject)"
|
||||||
branches="$(command git for-each-ref --sort=-committerdate --color --format="$fmt" "refs/heads/ohmyzsh/pull-*")"
|
branches="$(command git for-each-ref --sort=-committerdate --color --format="$fmt" "refs/heads/ohmyzsh/pull-*")"
|
||||||
|
|
||||||
# Exit if there are no PR branches
|
# Exit if there are no PR branches
|
||||||
if [[ -z "$branches" ]]; then
|
if [[ -z "$branches" ]]; then
|
||||||
_omz::log info "there are no Pull Request branches to remove."
|
_omz::log info "there are no Pull Request branches to remove."
|
||||||
return
|
return
|
||||||
fi
|
|
||||||
|
|
||||||
# Print found PR branches
|
|
||||||
echo "$branches\n"
|
|
||||||
# Confirm before removing the branches
|
|
||||||
_omz::confirm "do you want remove these Pull Request branches? [Y/n] "
|
|
||||||
# Only proceed if the answer is a valid yes option
|
|
||||||
[[ "$REPLY" != [yY$'\n'] ]] && return
|
|
||||||
|
|
||||||
_omz::log info "removing all Oh My Zsh Pull Request branches..."
|
|
||||||
command git branch --list 'ohmyzsh/pull-*' | while read branch; do
|
|
||||||
command git branch -D "$branch"
|
|
||||||
done
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
function _omz::pr::test {
|
|
||||||
# Allow $1 to be a URL to the pull request
|
|
||||||
if [[ "$1" = https://* ]]; then
|
|
||||||
1="${1:t}"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check the input
|
# Print found PR branches
|
||||||
if ! [[ -n "$1" && "$1" =~ ^[[:digit:]]+$ ]]; then
|
echo "$branches\n"
|
||||||
echo >&2 "Usage: omz pr test <PR_NUMBER_or_URL>"
|
# Confirm before removing the branches
|
||||||
return 1
|
_omz::confirm "do you want remove these Pull Request branches? [Y/n] "
|
||||||
fi
|
|
||||||
|
|
||||||
# Save current git HEAD
|
|
||||||
local branch
|
|
||||||
branch=$(builtin cd -q "$ZSH"; git symbolic-ref --short HEAD) || {
|
|
||||||
_omz::log error "error when getting the current git branch. Aborting..."
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# Fetch PR onto ohmyzsh/pull-<PR_NUMBER> branch and rebase against master
|
|
||||||
# If any of these operations fail, undo the changes made
|
|
||||||
(
|
|
||||||
set -e
|
|
||||||
builtin cd -q "$ZSH"
|
|
||||||
|
|
||||||
# Get the ohmyzsh git remote
|
|
||||||
command git remote -v | while read remote url _; do
|
|
||||||
case "$url" in
|
|
||||||
https://github.com/ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
|
|
||||||
git@github.com:ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
(( $found )) || {
|
|
||||||
_omz::log error "could not found the ohmyzsh git remote. Aborting..."
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Fetch pull request head
|
|
||||||
_omz::log info "fetching PR #$1 to ohmyzsh/pull-$1..."
|
|
||||||
command git fetch -f "$remote" refs/pull/$1/head:ohmyzsh/pull-$1 || {
|
|
||||||
_omz::log error "error when trying to fetch PR #$1."
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Rebase pull request branch against the current master
|
|
||||||
_omz::log info "rebasing PR #$1..."
|
|
||||||
command git rebase master ohmyzsh/pull-$1 || {
|
|
||||||
command git rebase --abort &>/dev/null
|
|
||||||
_omz::log warn "could not rebase PR #$1 on top of master."
|
|
||||||
_omz::log warn "you might not see the latest stable changes."
|
|
||||||
_omz::log info "run \`zsh\` to test the changes."
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
_omz::log info "fetch of PR #${1} successful."
|
|
||||||
)
|
|
||||||
|
|
||||||
# If there was an error, abort running zsh to test the PR
|
|
||||||
[[ $? -eq 0 ]] || return 1
|
|
||||||
|
|
||||||
# Run zsh to test the changes
|
|
||||||
_omz::log info "running \`zsh\` to test the changes. Run \`exit\` to go back."
|
|
||||||
command zsh -l
|
|
||||||
|
|
||||||
# After testing, go back to the previous HEAD if the user wants
|
|
||||||
_omz::confirm "do you want to go back to the previous branch? [Y/n] "
|
|
||||||
# Only proceed if the answer is a valid yes option
|
# Only proceed if the answer is a valid yes option
|
||||||
[[ "$REPLY" != [yY$'\n'] ]] && return
|
[[ "$REPLY" != [yY$'\n'] ]] && return
|
||||||
|
|
||||||
(
|
_omz::log info "removing all Oh My Zsh Pull Request branches..."
|
||||||
set -e
|
command git branch --list 'ohmyzsh/pull-*' | while read branch; do
|
||||||
builtin cd -q "$ZSH"
|
command git branch -D "$branch"
|
||||||
|
done
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
command git checkout "$branch" -- || {
|
function _omz::pr::test {
|
||||||
_omz::log error "could not go back to the previous branch ('$branch')."
|
# Allow $1 to be a URL to the pull request
|
||||||
return 1
|
if [[ "$1" = https://* ]]; then
|
||||||
}
|
1="${1:t}"
|
||||||
)
|
fi
|
||||||
|
|
||||||
|
# Check the input
|
||||||
|
if ! [[ -n "$1" && "$1" =~ ^[[:digit:]]+$ ]]; then
|
||||||
|
echo >&2 "Usage: omz pr test <PR_NUMBER_or_URL>"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Save current git HEAD
|
||||||
|
local branch
|
||||||
|
branch=$(builtin cd -q "$ZSH"; git symbolic-ref --short HEAD) || {
|
||||||
|
_omz::log error "error when getting the current git branch. Aborting..."
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Fetch PR onto ohmyzsh/pull-<PR_NUMBER> branch and rebase against master
|
||||||
|
# If any of these operations fail, undo the changes made
|
||||||
|
(
|
||||||
|
set -e
|
||||||
|
builtin cd -q "$ZSH"
|
||||||
|
|
||||||
|
# Get the ohmyzsh git remote
|
||||||
|
command git remote -v | while read remote url _; do
|
||||||
|
case "$url" in
|
||||||
|
https://github.com/ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
|
||||||
|
git@github.com:ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
(( $found )) || {
|
||||||
|
_omz::log error "could not found the ohmyzsh git remote. Aborting..."
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Fetch pull request head
|
||||||
|
_omz::log info "fetching PR #$1 to ohmyzsh/pull-$1..."
|
||||||
|
command git fetch -f "$remote" refs/pull/$1/head:ohmyzsh/pull-$1 || {
|
||||||
|
_omz::log error "error when trying to fetch PR #$1."
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Rebase pull request branch against the current master
|
||||||
|
_omz::log info "rebasing PR #$1..."
|
||||||
|
command git rebase master ohmyzsh/pull-$1 || {
|
||||||
|
command git rebase --abort &>/dev/null
|
||||||
|
_omz::log warn "could not rebase PR #$1 on top of master."
|
||||||
|
_omz::log warn "you might not see the latest stable changes."
|
||||||
|
_omz::log info "run \`zsh\` to test the changes."
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
_omz::log info "fetch of PR #${1} successful."
|
||||||
|
)
|
||||||
|
|
||||||
|
# If there was an error, abort running zsh to test the PR
|
||||||
|
[[ $? -eq 0 ]] || return 1
|
||||||
|
|
||||||
|
# Run zsh to test the changes
|
||||||
|
_omz::log info "running \`zsh\` to test the changes. Run \`exit\` to go back."
|
||||||
|
command zsh -l
|
||||||
|
|
||||||
|
# After testing, go back to the previous HEAD if the user wants
|
||||||
|
_omz::confirm "do you want to go back to the previous branch? [Y/n] "
|
||||||
|
# Only proceed if the answer is a valid yes option
|
||||||
|
[[ "$REPLY" != [yY$'\n'] ]] && return
|
||||||
|
|
||||||
|
(
|
||||||
|
set -e
|
||||||
|
builtin cd -q "$ZSH"
|
||||||
|
|
||||||
|
command git checkout "$branch" -- || {
|
||||||
|
_omz::log error "could not go back to the previous branch ('$branch')."
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function _omz::theme {
|
function _omz::theme {
|
||||||
(( $# > 0 && $+functions[_omz::theme::$1] )) || {
|
(( $# > 0 && $+functions[_omz::theme::$1] )) || {
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
Usage: omz theme <command> [options]
|
Usage: omz theme <command> [options]
|
||||||
|
|
||||||
Available commands:
|
Available commands:
|
||||||
|
|
||||||
list List all available Oh My Zsh themes
|
list List all available Oh My Zsh themes
|
||||||
use <theme> Load an Oh My Zsh theme
|
use <theme> Load an Oh My Zsh theme
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
local command="$1"
|
local command="$1"
|
||||||
shift
|
shift
|
||||||
|
|
||||||
_omz::theme::$command "$@"
|
_omz::theme::$command "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
function _omz::theme::list {
|
function _omz::theme::list {
|
||||||
local -a custom_themes builtin_themes
|
local -a custom_themes builtin_themes
|
||||||
custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
|
custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
|
||||||
builtin_themes=("$ZSH"/themes/*.zsh-theme(.N:t:r))
|
builtin_themes=("$ZSH"/themes/*.zsh-theme(.N:t:r))
|
||||||
|
|
||||||
# If the command is being piped, print all found line by line
|
# If the command is being piped, print all found line by line
|
||||||
if [[ ! -t 1 ]]; then
|
if [[ ! -t 1 ]]; then
|
||||||
print -l ${(q-)custom_themes} ${(q-)builtin_themes}
|
print -l ${(q-)custom_themes} ${(q-)builtin_themes}
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if (( ${#custom_themes} )); then
|
if (( ${#custom_themes} )); then
|
||||||
print -P "%U%BCustom themes%b%u:"
|
print -P "%U%BCustom themes%b%u:"
|
||||||
print -l ${(q-)custom_themes} | column
|
print -l ${(q-)custom_themes} | column
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if (( ${#builtin_themes} )); then
|
if (( ${#builtin_themes} )); then
|
||||||
(( ${#custom_themes} )) && echo # add a line of separation
|
(( ${#custom_themes} )) && echo # add a line of separation
|
||||||
|
|
||||||
print -P "%U%BBuilt-in themes%b%u:"
|
print -P "%U%BBuilt-in themes%b%u:"
|
||||||
print -l ${(q-)builtin_themes} | column
|
print -l ${(q-)builtin_themes} | column
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function _omz::theme::use {
|
function _omz::theme::use {
|
||||||
if [[ -z "$1" ]]; then
|
if [[ -z "$1" ]]; then
|
||||||
echo >&2 "Usage: omz theme use <theme>"
|
echo >&2 "Usage: omz theme use <theme>"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Respect compatibility with old lookup order
|
# Respect compatibility with old lookup order
|
||||||
if [[ -f "$ZSH_CUSTOM/$1.zsh-theme" ]]; then
|
if [[ -f "$ZSH_CUSTOM/$1.zsh-theme" ]]; then
|
||||||
source "$ZSH_CUSTOM/$1.zsh-theme"
|
source "$ZSH_CUSTOM/$1.zsh-theme"
|
||||||
elif [[ -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ]]; then
|
elif [[ -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ]]; then
|
||||||
source "$ZSH_CUSTOM/themes/$1.zsh-theme"
|
source "$ZSH_CUSTOM/themes/$1.zsh-theme"
|
||||||
elif [[ -f "$ZSH/themes/$1.zsh-theme" ]]; then
|
elif [[ -f "$ZSH/themes/$1.zsh-theme" ]]; then
|
||||||
source "$ZSH/themes/$1.zsh-theme"
|
source "$ZSH/themes/$1.zsh-theme"
|
||||||
else
|
else
|
||||||
_omz::log error "theme '$1' not found"
|
_omz::log error "theme '$1' not found"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function _omz::update {
|
function _omz::update {
|
||||||
# Run update script
|
# Run update script
|
||||||
env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
|
env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
|
||||||
# Update last updated file
|
local ret=$?
|
||||||
zmodload zsh/datetime
|
# Update last updated file
|
||||||
echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
|
zmodload zsh/datetime
|
||||||
# Remove update lock if it exists
|
echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
|
||||||
command rm -rf "$ZSH/log/update.lock"
|
# Remove update lock if it exists
|
||||||
|
command rm -rf "$ZSH/log/update.lock"
|
||||||
|
# Restart the zsh session
|
||||||
|
if [[ $ret -eq 0 ]]; then
|
||||||
|
# Check whether to run a login shell
|
||||||
|
[[ "$ZSH_ARGZERO" = -* ]] && exec -l "${ZSH_ARGZERO#-}" || exec "$ZSH_ARGZERO"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,17 @@ function upgrade_oh_my_zsh() {
|
||||||
|
|
||||||
# Run update script
|
# Run update script
|
||||||
env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
|
env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
|
||||||
|
local ret=$?
|
||||||
# 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
|
||||||
|
if [[ $ret -eq 0 ]]; then
|
||||||
|
# Check whether to run a login shell
|
||||||
|
[[ "$ZSH_ARGZERO" = -* ]] && exec -l "${ZSH_ARGZERO#-}" || exec "$ZSH_ARGZERO"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function take() {
|
function take() {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue