mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-12-19 20:29:45 +01:00
feat(sudo): support aliases to $EDITOR (#9431)
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
This commit is contained in:
parent
1beac5958e
commit
874d83f7b8
1 changed files with 31 additions and 21 deletions
|
@ -9,40 +9,48 @@
|
||||||
# -------
|
# -------
|
||||||
#
|
#
|
||||||
# * Dongweiming <ciici123@gmail.com>
|
# * Dongweiming <ciici123@gmail.com>
|
||||||
|
# * Subhaditya Nath <github.com/subnut>
|
||||||
|
# * Marc Cornellà <github.com/mcornella>
|
||||||
#
|
#
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
__sudo-replace-buffer() {
|
||||||
|
local old=$1 new=$2 space=${2:+ }
|
||||||
|
if [[ ${#LBUFFER} -le ${#old} ]]; then
|
||||||
|
RBUFFER="${space}${BUFFER#$old }"
|
||||||
|
LBUFFER="${new}"
|
||||||
|
else
|
||||||
|
LBUFFER="${new}${space}${LBUFFER#$old }"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
sudo-command-line() {
|
sudo-command-line() {
|
||||||
[[ -z $BUFFER ]] && LBUFFER="$(fc -ln -1)"
|
[[ -z $BUFFER ]] && LBUFFER="$(fc -ln -1)"
|
||||||
|
|
||||||
# Save beginning space
|
# Save beginning space
|
||||||
local WHITESPACE=""
|
local WHITESPACE=""
|
||||||
if [[ ${LBUFFER:0:1} == " " ]] ; then
|
if [[ ${LBUFFER:0:1} = " " ]]; then
|
||||||
WHITESPACE=" "
|
WHITESPACE=" "
|
||||||
LBUFFER="${LBUFFER:1}"
|
LBUFFER="${LBUFFER:1}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n $EDITOR && $BUFFER == $EDITOR\ * ]]; then
|
# Get the first part of the typed command and check if it's an alias to $EDITOR
|
||||||
if [[ ${#LBUFFER} -le ${#EDITOR} ]]; then
|
# If so, locally change $EDITOR to the alias so that it matches below
|
||||||
RBUFFER=" ${BUFFER#$EDITOR }"
|
if [[ -n "$EDITOR" ]]; then
|
||||||
LBUFFER="sudoedit"
|
local cmd="${${(Az)BUFFER}[1]}"
|
||||||
else
|
if [[ "${aliases[$cmd]} " = (\$EDITOR|$EDITOR)\ * ]]; then
|
||||||
LBUFFER="sudoedit ${LBUFFER#$EDITOR }"
|
local EDITOR="$cmd"
|
||||||
fi
|
|
||||||
elif [[ $BUFFER == sudoedit\ * ]]; then
|
|
||||||
if [[ ${#LBUFFER} -le 8 ]]; then
|
|
||||||
RBUFFER=" ${BUFFER#sudoedit }"
|
|
||||||
LBUFFER="$EDITOR"
|
|
||||||
else
|
|
||||||
LBUFFER="$EDITOR ${LBUFFER#sudoedit }"
|
|
||||||
fi
|
|
||||||
elif [[ $BUFFER == sudo\ * ]]; then
|
|
||||||
if [[ ${#LBUFFER} -le 4 ]]; then
|
|
||||||
RBUFFER="${BUFFER#sudo }"
|
|
||||||
LBUFFER=""
|
|
||||||
else
|
|
||||||
LBUFFER="${LBUFFER#sudo }"
|
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n $EDITOR && $BUFFER = $EDITOR\ * ]]; then
|
||||||
|
__sudo-replace-buffer "$EDITOR" "sudoedit"
|
||||||
|
elif [[ -n $EDITOR && $BUFFER = \$EDITOR\ * ]]; then
|
||||||
|
__sudo-replace-buffer "\$EDITOR" "sudoedit"
|
||||||
|
elif [[ $BUFFER = sudoedit\ * ]]; then
|
||||||
|
__sudo-replace-buffer "sudoedit" "$EDITOR"
|
||||||
|
elif [[ $BUFFER = sudo\ * ]]; then
|
||||||
|
__sudo-replace-buffer "sudo" ""
|
||||||
else
|
else
|
||||||
LBUFFER="sudo $LBUFFER"
|
LBUFFER="sudo $LBUFFER"
|
||||||
fi
|
fi
|
||||||
|
@ -50,7 +58,9 @@ sudo-command-line() {
|
||||||
# Preserve beginning space
|
# Preserve beginning space
|
||||||
LBUFFER="${WHITESPACE}${LBUFFER}"
|
LBUFFER="${WHITESPACE}${LBUFFER}"
|
||||||
}
|
}
|
||||||
|
|
||||||
zle -N sudo-command-line
|
zle -N sudo-command-line
|
||||||
|
|
||||||
# Defined shortcut keys: [Esc] [Esc]
|
# Defined shortcut keys: [Esc] [Esc]
|
||||||
bindkey -M emacs '\e\e' sudo-command-line
|
bindkey -M emacs '\e\e' sudo-command-line
|
||||||
bindkey -M vicmd '\e\e' sudo-command-line
|
bindkey -M vicmd '\e\e' sudo-command-line
|
||||||
|
|
Loading…
Reference in a new issue