Zsh Mailing List Archive Messages sorted by: Reverse Date, Date, Thread, Author

[PATCH] Completion: Small fixes for _jq and _ldd

X-seq: zsh-workers 42918
From: dana <dana@xxxxxxx>
To: Zsh workers <zsh-workers@xxxxxxx>
Subject: [PATCH] Completion: Small fixes for _jq and _ldd
Date: Sat, 2 Jun 2018 17:15:48 -0500
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dana-is.20150623.gappssmtp.com; s=20150623; h=from:content-transfer-encoding:mime-version:subject:message-id:date :to; bh=Fp6eTTjG6lO52Mt94EuZdtiQkKJOM9+QKOWgg6YpubY=; b=CwE2CDxmYouDDK+C/jxR1bYjtMs6SyNdago1xBVd+omai2gTbGOzfN1JYeZ2XDzWgm nCIoTi8P068XGgYzvP6YvHni3AMjXlpsawCFLeTuT7qE//ZEa4atMNplwA0b7FZVZr/N U7JUzkQoRbIEu+91gWMOoLtorB9Du3t5EZD3zn9+D0J5tPnxI6lPDIrT11WCVyQJ4ZIU uv5zFTft4RQHdsAQK6uia/l9fFwtbs+kKuqsk07avnzpMv2GGcRK9zhC5mm4Bpgy0YQW vGrcb0IhOMQ/5X0Bn/4pCRUOFjBs0YaehUdI0/zaSP6FlgDH5A+jnXRL/K2iapT/2+gP RTLQ==
List-help: <mailto:zsh-workers-help@zsh.org>
List-id: Zsh Workers List <zsh-workers.zsh.org>
List-post: <mailto:zsh-workers@zsh.org>
List-unsubscribe: <mailto:zsh-workers-unsubscribe@zsh.org>
Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm

Hello,

Someone on IRC complained that the jq completer doesn't complete file paths.
Sure enough, there's a small bug there. Fixed that.

Also, in workers # 42236 i mentioned that the ldd completer doesn't work on
Linux (or not on Ubuntu, anyway) because the 'gnu' variant detection is broken.
I submitted a patch at the time but it was probably missed because i didn't mark
it as such. Here it is again.

dana


diff --git a/Completion/Unix/Command/_jq b/Completion/Unix/Command/_jq
index 55bb93c04..4ff05dab4 100644
--- a/Completion/Unix/Command/_jq
+++ b/Completion/Unix/Command/_jq
@@ -31,4 +31,4 @@ _arguments -S -s : \
   '*--argjson[pre-set a variable to an object]: :_guard "|[A-Za-z][A-Za-z0-9]#" "variable name":value (JSON): ' \
   '*--slurpfile[pre-set a variable to contents of a file]: :_guard "|[A-Za-z][A-Za-z0-9]#" "variable name":value (filename of file containing JSON):_files' \
   "1: :_guard '|[^-]' filter" \
-  "*:_files"
+  "*: :_files"


diff --git a/Completion/Unix/Command/_ldd b/Completion/Unix/Command/_ldd
index 19b8a9105..1de1659a5 100644
--- a/Completion/Unix/Command/_ldd
+++ b/Completion/Unix/Command/_ldd
@@ -1,6 +1,6 @@
 #compdef ldd
 
-if _pick_variant gnu='(GNU|EGLIBC|Gentoo)' unix --version; then
+if _pick_variant gnu='(Free Soft|GNU|EGLIBC|Gentoo)' unix --version; then
   args=(
     '(- *)--version[display version information]'
     '(- *)--help[display help information]'

Messages sorted by: Reverse Date, Date, Thread, Author