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

zsh:diffcmds: Do the quotation only once

Browse Source
This commit is contained in:
Julian Prein
2024-03-24 17:54:11 +01:00
parent 09f437a860
commit 52e5d1ab4d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -691,11 +691,12 @@ diffcmds() {
let i++ let i++
fi fi
# Quote special characters but unquote standalone pipes before `--`
set -- "${(@)${(q@)@:1:$((i-1))}/#%\\|/|}" "${(q@)@:$i}"
# 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
# Quote special characters, unquote standalone pipes and replace %% with eval "${(@)${@:1:$((i-1))}//\%\%/$@[$#]}"
# the only argument
eval "${(@)${(@)${(q@)@:1:$((i-1))}/#%\\|/|}//\%\%/${(q)@[$#]}}"
return return
fi fi
@@ -716,11 +717,10 @@ diffcmds() {
cmdline=("$cmd") cmdline=("$cmd")
for arg in "${@:$((i+1))}"; do for arg in "${@:$((i+1))}"; do
# Add a layer of quotation but unquoting standalone pipes again, # Substitute placeholder and wrap in process substitution
# substitute placeholder and finally wrap in process substitution
cmdline+=( cmdline+=(
"$ps_sub" "$ps_sub"
"${(@)${(@)${(q@)@:1:$((i-1))}/#%\\|/|}//\%\%/${(q)arg}}" "${(@)${@:1:$((i-1))}//\%\%/$arg}"
")" ")"
) )
done done