From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17807 invoked by alias); 2 Jun 2018 22:15:54 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 42918 Received: (qmail 16504 invoked by uid 1010); 2 Jun 2018 22:15:54 -0000 X-Qmail-Scanner-Diagnostics: from mail-io0-f194.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(209.85.223.194):SA:0(-3.6/5.0):. Processed in 1.315413 secs); 02 Jun 2018 22:15:54 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_PASS,T_DKIMWL_WL_MED,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: dana@dana.is X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | 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== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:content-transfer-encoding:mime-version :subject:message-id:date:to; bh=Fp6eTTjG6lO52Mt94EuZdtiQkKJOM9+QKOWgg6YpubY=; b=NaNQzuuZg55KK72s6GTR9yd5N/mcJIQzk48j16evSunVFoRfFDc9PvtsePz0gQq456 fczAd5bUnVrM+hRUNDcj/z6s+gXu3K0ynDddSSavuaBuRqWvg2DY+wuIlLaE8q5TIzc6 tOFnWfJt1p1akPWbK9M18sQG4BkN8Zla1mHQtB+21vfog01kEpjTKEe/VEZ+LkJVY9cu DfrtNdpt2LDz0BtSc6dzlzwPjv/ALaHkKNSpyLFpB8Yi0iVxEsbOndtbNyBwL1EkYIa/ T00l7N1oxG8dFrXnvHLinbC5aZuj3m6PtAATq3g964kLItMe0jAodJhVWi2rvWYb/l3V qMPw== X-Gm-Message-State: APt69E1S4A0uuc7oFE0dQNzsZa3bM0FuBHqUARXKEQ73kjq3+IBkSUHq 5uImdAr0UT3z/Z2/JmO0aBJMefmKk1A= X-Google-Smtp-Source: ADUXVKLAZlEusXfnx72yOT2WSnaZKYlBicwUTc9n/o7PwExzp+yagTrFCgI2nz7im5RmJq7d++YKmA== X-Received: by 2002:a6b:31a:: with SMTP id 26-v6mr16995826iod.66.1527977749904; Sat, 02 Jun 2018 15:15:49 -0700 (PDT) From: dana Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: [PATCH] Completion: Small fixes for _jq and _ldd Message-Id: <8EC28F04-005C-45A1-896F-AB86CEC86122@dana.is> Date: Sat, 2 Jun 2018 17:15:48 -0500 To: Zsh workers X-Mailer: Apple Mail (2.3273) 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 =20 -if _pick_variant gnu=3D'(GNU|EGLIBC|Gentoo)' unix --version; then +if _pick_variant gnu=3D'(Free Soft|GNU|EGLIBC|Gentoo)' unix --version; = then args=3D( '(- *)--version[display version information]' '(- *)--help[display help information]'