|
@@ -15,48 +15,48 @@
|
|
# ------------------------------------------------------------------------------
|
|
# ------------------------------------------------------------------------------
|
|
|
|
|
|
__sudo-replace-buffer() {
|
|
__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
|
|
|
|
|
|
+ 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
|
|
|
|
- local WHITESPACE=""
|
|
|
|
- if [[ ${LBUFFER:0:1} = " " ]]; then
|
|
|
|
- WHITESPACE=" "
|
|
|
|
- LBUFFER="${LBUFFER:1}"
|
|
|
|
- fi
|
|
|
|
|
|
+ # Save beginning space
|
|
|
|
+ local WHITESPACE=""
|
|
|
|
+ if [[ ${LBUFFER:0:1} = " " ]]; then
|
|
|
|
+ WHITESPACE=" "
|
|
|
|
+ LBUFFER="${LBUFFER:1}"
|
|
|
|
+ fi
|
|
|
|
|
|
- # Get the first part of the typed command and check if it's an alias to $EDITOR
|
|
|
|
- # If so, locally change $EDITOR to the alias so that it matches below
|
|
|
|
- if [[ -n "$EDITOR" ]]; then
|
|
|
|
- local cmd="${${(Az)BUFFER}[1]}"
|
|
|
|
- if [[ "${aliases[$cmd]} " = (\$EDITOR|$EDITOR)\ * ]]; then
|
|
|
|
- local EDITOR="$cmd"
|
|
|
|
- fi
|
|
|
|
|
|
+ # Get the first part of the typed command and check if it's an alias to $EDITOR
|
|
|
|
+ # If so, locally change $EDITOR to the alias so that it matches below
|
|
|
|
+ if [[ -n "$EDITOR" ]]; then
|
|
|
|
+ local cmd="${${(Az)BUFFER}[1]}"
|
|
|
|
+ if [[ "${aliases[$cmd]} " = (\$EDITOR|$EDITOR)\ * ]]; then
|
|
|
|
+ local EDITOR="$cmd"
|
|
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
|
|
|
|
- LBUFFER="sudo $LBUFFER"
|
|
|
|
- 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
|
|
|
|
+ LBUFFER="sudo $LBUFFER"
|
|
|
|
+ fi
|
|
|
|
|
|
- # Preserve beginning space
|
|
|
|
- LBUFFER="${WHITESPACE}${LBUFFER}"
|
|
|
|
|
|
+ # Preserve beginning space
|
|
|
|
+ LBUFFER="${WHITESPACE}${LBUFFER}"
|
|
}
|
|
}
|
|
|
|
|
|
zle -N sudo-command-line
|
|
zle -N sudo-command-line
|