dolysis
/
ohmyzsh
3
0
Fork 0
Code Issues Pull Requests Releases Activity

fix(cli): allow `omz` commands to be used in a script (#10645) 

The commands `omz plugin {enable,disable}` and `omz theme set`
automatically reload the zsh session on success. With this
change, the CLI checks whether the commands are run in an
interactive session before reloading the zsh session.

This change also conditionally sets the completion function
for `omz` so that it's not done in a non-interactive session.
This commit is contained in:
Marc Cornellà 2022-02-02 23:02:23 +01:00 committed by GitHub
parent 4ee0cf3cb4
commit e1a9d0ce3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/cli.zsh
View File

@ -105,7 +105,10 @@ function _omz {
return 0 return 0
} }
# If run from a script, do not set the completion function
if (( ${+functions[compdef]} )); then
compdef _omz omz compdef _omz omz
fi
## Utility functions ## Utility functions
@ -299,10 +302,8 @@ multi == 1 && length(\$0) > 0 {
# Restart the zsh session if there were no errors # Restart the zsh session if there were no errors
_omz::log info "plugins disabled: ${(j:, :)dis_plugins}." _omz::log info "plugins disabled: ${(j:, :)dis_plugins}."
# Old zsh versions don't have ZSH_ARGZERO # Only reload zsh if run in an interactive session
local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}" [[ ! -o interactive ]] || _omz::reload
# Check whether to run a login shell
[[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
} }
function _omz::plugin::enable { function _omz::plugin::enable {
@ -375,10 +376,8 @@ multi == 1 && /^[^#]*\)/ {
# Restart the zsh session if there were no errors # Restart the zsh session if there were no errors
_omz::log info "plugins enabled: ${(j:, :)add_plugins}." _omz::log info "plugins enabled: ${(j:, :)add_plugins}."
# Old zsh versions don't have ZSH_ARGZERO # Only reload zsh if run in an interactive session
local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}" [[ ! -o interactive ]] || _omz::reload
# Check whether to run a login shell
[[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
} }
function _omz::plugin::info { function _omz::plugin::info {
@ -731,10 +730,8 @@ EOF
# Restart the zsh session if there were no errors # Restart the zsh session if there were no errors
_omz::log info "'$1' theme set correctly." _omz::log info "'$1' theme set correctly."
# Old zsh versions don't have ZSH_ARGZERO # Only reload zsh if run in an interactive session
local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}" [[ ! -o interactive ]] || _omz::reload
# Check whether to run a login shell
[[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
} }
function _omz::theme::use { function _omz::theme::use {