From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16888 invoked by alias); 16 Jul 2018 14:44:28 -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: 43177 Received: (qmail 8020 invoked by uid 1010); 16 Jul 2018 14:44:27 -0000 X-Qmail-Scanner-Diagnostics: from rcpt-mqugw.biglobe.ne.jp 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(133.208.100.1):SA:0(-2.6/5.0):. Processed in 1.716068 secs); 16 Jul 2018 14:44:27 -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=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: takimoto-j@kba.biglobe.ne.jp X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | X-Biglobe-Sender: From: "Jun T." 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] _grep: support bzgrep (and add a few options for darwin) Message-Id: Date: Mon, 16 Jul 2018 23:01:49 +0900 To: zsh-workers@zsh.org X-Mailer: Apple Mail (2.3273) X-Biglobe-Spnum: 60707 Add support for bzgrep. Also add a few options specific to darwin. diff --git a/Completion/Unix/Command/_grep = b/Completion/Unix/Command/_grep index 5f45ce9a8..3bc8d3fe0 100644 --- a/Completion/Unix/Command/_grep +++ b/Completion/Unix/Command/_grep @@ -1,4 +1,4 @@ -#compdef grep egrep fgrep bsdgrep zgrep zegrep zfgrep ggrep gegrep = gfgrep gzgrep gzegrep gzfgrep -value-,GREP_OPTIONS,-default- +#compdef grep egrep fgrep bsdgrep zgrep zegrep zfgrep ggrep gegrep = gfgrep gzgrep gzegrep gzfgrep bzgrep bzegrep bzfgrep = -value-,GREP_OPTIONS,-default- =20 local arguments matchers command variant =20 @@ -11,13 +11,15 @@ else arguments=3D( '(-e --regexp -f --file)1: :_guard "^-*" pattern' ) if [[ $service =3D z* ]]; then arguments+=3D( '*:files:_files -g "*.gz(-.)"' ) + elif [[ $service =3D bz* ]]; then + arguments+=3D( '*:files:_files -g "*.bz2(-.)"' ) else arguments+=3D( '*:files:_files' ) fi command=3D"$words[1]" fi =20 -if [[ $service !=3D (|g)(|z)[ef]grep ]]; then +if [[ $service !=3D (|g|z|gz|bz)[ef]grep ]]; then matchers=3D'(--extended-regexp --fixed-strings --basic-regexp = --perl-regexp -E -F -G -P)' arguments+=3D( $matchers{--extended-regexp,-E}'[use extended regular expression]' @@ -66,7 +68,7 @@ arguments+=3D( _pick_variant -r variant -c "$command" gnu=3Dgnu gpl2=3D2.5.1 unix = --version case $variant:$OSTYPE in (gnu:*|gpl2:freebsd*)) - [[ $service !=3D (|g)(|z)[ef]grep ]] && arguments+=3D( + [[ $service !=3D (|g|z|gz|bz)[ef]grep ]] && arguments+=3D( $matchers{--perl-regexp,-P}'[use perl regular expression]' ) ;| @@ -76,15 +78,19 @@ case $variant:$OSTYPE in '(-z --null-data)'{-z,--null-data}'[input data separated by 0 = byte, not newline]' ) ;| - gpl2:freebsd*) + gpl2:(freebsd|darwin)*) arguments+=3D( '(--null --no-filename -h)--null[print 0 byte after each = filename]' + '(-Z --decompress -J = --bz2decompress)'{-J,--bz2decompress}"[decompress bzip2'ed input before = searching]" + '(-Z --decompress -J = --bz2decompress)'{-Z,--decompress}"[decompress gzip'ed input before = searching]" ) ;| - gpl2:(freebsd|darwin)*) + gpl2:darwin*) arguments+=3D( - '(-Z --decompress -J = --bz2decompress)'{-J,--bz2decompress}"[decompress bzip2'ed input before = searching]" - '(-Z --decompress -J = --bz2decompress)'{-Z,--decompress}"[decompress gzip'ed input before = searching]" + '(-p -S)-O[follow symlinks on the command line]' + '(-O -S)-p[do not follow symlinks]' + '(-O -p)-S[follow all symlinks]' + '*--include-dir=3D[only search directories matching specified = pattern]:directory pattern' ) ;| (gnu:*|gpl2:netbsd*))