New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: Implement auto-detection of subexecutor #12261
Open
pepoluan
wants to merge
12
commits into
ohmyzsh:master
Choose a base branch
from
pepoluan:omz-subexecutor
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
a13fdca
feat: Implement auto-detection of subexecutor
pepoluan 00f57b9
Update CODEOWNERS
pepoluan ca09c45
Merge branch 'ohmyzsh:master' into omz-subexecutor
pepoluan 7cc5801
Update README.md : Add section about subexecutor auto-detection
pepoluan f1935b7
BUGFIX: Also remove 'ssh' from term title
pepoluan 7ddee97
Add 'subex' no-correction
pepoluan 274d43c
Merge branch 'ohmyzsh:master' into omz-subexecutor
pepoluan a80c6ea
Merge branch 'ohmyzsh:master' into omz-subexecutor
pepoluan 8913f0e
Merge branch 'master' into omz-subexecutor
pepoluan 22017d6
Merge branch 'ohmyzsh:master' into omz-subexecutor
pepoluan 4c7cbfe
Merge branch 'ohmyzsh:master' into omz-subexecutor
pepoluan 972c663
Merge branch 'ohmyzsh:master' into omz-subexecutor
pepoluan File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
## Provides auto-detection of subexecutor to use | ||
|
||
# If in the future a new subexecuter is created, we only need to edit this array | ||
typeset _KNOWN_SUBEXES=( "doas" "sudo" ) | ||
typeset _SUBEX | ||
|
||
function _SetupSubexecutor() { | ||
local _i | ||
local _cmd | ||
zstyle -s ':omz' 'subexecutor' _SUBEX | ||
if [[ "$_SUBEX" ]]; then | ||
if command -v "$_SUBEX" > /dev/null; then | ||
return 0 | ||
fi | ||
print "Cannot find subexecutor '${_SUBEX}'; please check your configuration!" >&2 | ||
return 1 | ||
fi | ||
for _i in "${_KNOWN_SUBEXES[@]}"; do | ||
if command -v "$_i" > /dev/null; then | ||
_SUBEX="$_i" | ||
break | ||
fi | ||
done | ||
if [[ -z $_SUBEX ]]; then | ||
print "oh-my-zsh: cannot auto-detect subexecutor; please specify explicitly using 'zstyle :omz subexecutor'." >&2 | ||
return 1 | ||
fi | ||
zstyle ':omz' 'subexecutor' "$_SUBEX" | ||
} | ||
|
||
_SetupSubexecutor | ||
unfunction _SetupSubexecutor | ||
unset _KNOWN_SUBEXES | ||
|
||
# The alias provides a 'hardcoded', invariant subexecutor to use throughout the shell session | ||
alias _="$_SUBEX " | ||
|
||
# The function is, in contrast, modifiable by changing the :omz->subexecutor zstyle | ||
function subex() { | ||
local _subex | ||
zstyle -s ':omz' 'subexecutor' _subex | ||
${_subex} "$@" | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,9 +27,6 @@ elif (( ${+commands[more]} )); then | |
env_default 'PAGER' 'more' | ||
fi | ||
|
||
## super user alias | ||
alias _='sudo ' | ||
|
||
Comment on lines
-30
to
-32
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Moved to |
||
## more intelligent acking for ubuntu users and no alias for users without ack | ||
if (( $+commands[ack-grep] )); then | ||
alias afind='ack-grep -il' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -95,8 +95,10 @@ function omz_termsupport_preexec { | |
fi | ||
fi | ||
|
||
# cmd name only, or if this is sudo or ssh, the next cmd | ||
local CMD="${1[(wr)^(*=*|sudo|ssh|mosh|rake|-*)]:gs/%/%%}" | ||
# cmd name only, or if this is doas/sudo or ssh, the next cmd | ||
local _subex | ||
zstyle -s ':omz' 'subexecutor' _subex | ||
local CMD="${1[(wr)^(*=*|${_subex}|_|subex|mosh|rake|-*)]:gs/%/%%}" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I replaced
|
||
local LINE="${2:gs/%/%%}" | ||
|
||
title "$CMD" "%100>...>${LINE}%<<" | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is taken out from
lib/misc.zsh
because the definition of the alias now relies completely on what subexecutor is being used.