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

zsh:diffcmds(): Change ps subs depending on diff*

Browse Source 
Process substitution via file descriptor/fifo should be preferred.
This commit is contained in:
Julian Prein
2023-06-23 23:08:27 +02:00
parent 393f7ec6e1
commit 3fea8b821a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -641,7 +641,7 @@ psofof() {
# would be equivalent to: # would be equivalent to:
# vimdiff =(utk file1 layout-table-full) =(utk file2 layout-table-full) # vimdiff =(utk file1 layout-table-full) =(utk file2 layout-table-full)
diffcmds() { diffcmds() {
local cmd i arg local cmd i arg ps_sub
local -a cmdline local -a cmdline
if (( $+commands[vimdiff] && ! $+commands[diff] )); then if (( $+commands[vimdiff] && ! $+commands[diff] )); then
@@ -668,9 +668,13 @@ diffcmds() {
let i++ let i++
fi fi
# NOTE: `=()` is necessary since vimdiff is seeking the file. See zshexpn(1)
[[ $cmd = vimdiff ]] && ps_sub='=(' || ps_sub='<('
# Substitute placeholder and wrap in process substitution
cmdline=("$cmd") cmdline=("$cmd")
for arg in "${@:$((i+1))}"; do for arg in "${@:$((i+1))}"; do
cmdline+=("=(" "${(q@)${@:1:$((i-1))}//\%\%/$arg}" ")") cmdline+=("$ps_sub" "${(q@)${@:1:$((i-1))}//\%\%/$arg}" ")")
done done
eval "$cmdline[@]" eval "$cmdline[@]"
} }