druckdev/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zsh:diffcmds: Improve comments and example

Browse Source
This commit is contained in:
Julian Prein
2024-03-24 17:29:18 +01:00
parent f1f9f36d43
commit ee31064286
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.config/zsh/zshrc.d/40-functions.zsh
View File

@@ -652,15 +652,18 @@ psofof() {
# diff the output of multiple commands following the same pattern. # diff the output of multiple commands following the same pattern.
# Uses vimdiff if it is installed and EDITOR or VISUAL are matching `vi`. # Uses vimdiff if it is installed and EDITOR or VISUAL are matching `vi`.
# Pipelines can be executed by quoting the pipes.
# #
# Example: # Example:
# diffcmds utk %% layout-table-full -- file1 file2 # diffcmds cat -n %% '|' head -- file1 file2
# #
# would be equivalent to: # would be equivalent to:
# vimdiff =(utk file1 layout-table-full) =(utk file2 layout-table-full) # vimdiff =(cat -n file1 | head) =(cat -n file2 | head)
#
diffcmds() { diffcmds() {
# TODO: Support own arguments for example to switch the placeholder or the # TODO: Support own arguments for example to switch the placeholder or the
# diffcmd # diffcmd
# TODO: Find better way to dequote pipes. (e.g. `%|` to use a pipe?)
local cmd i arg ps_sub local cmd i arg ps_sub
local -a cmdline local -a cmdline
@@ -690,7 +693,9 @@ diffcmds() {
# Just execute the command without *diff if there is only one argument # Just execute the command without *diff if there is only one argument
if (( i + 1 == # )); then if (( i + 1 == # )); then
# TODO: Implement better way to make pipes possible # Quote special characters, replace %% with the only argument and
# unquote pipes in arguments that consist of only the quoted pipe
# character.
eval "${(@)${(q@)${@:1:$((i-1))}//\%\%/${@[$#]}}/#%\\|/|}" eval "${(@)${(q@)${@:1:$((i-1))}//\%\%/${@[$#]}}/#%\\|/|}"
return return
fi fi
@@ -710,11 +715,10 @@ diffcmds() {
# NOTE: `=()` is necessary since vimdiff is seeking the file. See zshexpn(1) # NOTE: `=()` is necessary since vimdiff is seeking the file. See zshexpn(1)
[[ $cmd = vimdiff ]] && ps_sub='=(' || ps_sub='<(' [[ $cmd = vimdiff ]] && ps_sub='=(' || ps_sub='<('
# Substitute placeholder, wrap in process substitution and add a layer
# of quotation but unquoting single pipes again.
cmdline=("$cmd") cmdline=("$cmd")
for arg in "${@:$((i+1))}"; do for arg in "${@:$((i+1))}"; do
# TODO: Implement better way to make pipes possible # Substitute placeholder, wrap in process substitution and add a layer
# of quotation but unquoting single pipes again.
cmdline+=( cmdline+=(
"$ps_sub" "$ps_sub"
"${(@)${(q@)${@:1:$((i-1))}//\%\%/$arg}/#%\\|/|}" "${(@)${(q@)${@:1:$((i-1))}//\%\%/$arg}/#%\\|/|}"