From: Tomi Ollila Date: Sat, 2 May 2015 08:37:02 +0000 (+0300) Subject: Re: notmuch-mutt BSD compatibility X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1a9f124102a32c4db67a270bf9e75be045170297;p=notmuch-archives.git Re: notmuch-mutt BSD compatibility --- diff --git a/39/e2f4658d1c7c72f71563daa4f21b5bda87f349 b/39/e2f4658d1c7c72f71563daa4f21b5bda87f349 new file mode 100644 index 000000000..94a3b2dfd --- /dev/null +++ b/39/e2f4658d1c7c72f71563daa4f21b5bda87f349 @@ -0,0 +1,116 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 069556DE0B22 + for ; Sat, 2 May 2015 01:37:33 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 1.107 +X-Spam-Level: * +X-Spam-Status: No, score=1.107 tagged_above=-999 required=5 tests=[AWL=0.455, + SPF_NEUTRAL=0.652] autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id AoJF-Cq4mmrb for ; + Sat, 2 May 2015 01:37:30 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by arlo.cworth.org (Postfix) with ESMTP id 5F2A16DE09ED + for ; Sat, 2 May 2015 01:37:29 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id ACDFC10005A; + Sat, 2 May 2015 11:37:03 +0300 (EEST) +From: Tomi Ollila +To: Stefano Zacchiroli , Jack Peirce +Subject: Re: notmuch-mutt BSD compatibility +In-Reply-To: <20150501083623.GA6796@upsilon.cc> +References: <20150501052438.GA19579@ganesh.Home> + <20150501083623.GA6796@upsilon.cc> +User-Agent: Notmuch/0.19+109~ge80275e (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: quoted-printable +Cc: "notmuch@notmuchmail.org" +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 02 May 2015 08:37:33 -0000 + +On Fri, May 01 2015, Stefano Zacchiroli wrote: + +> On Fri, May 01, 2015 at 05:24:39AM +0000, Jack Peirce wrote: +>> Some of the flags used in the notmuch-mutt script included in the +>> contrib directory are not supported by the OpenBSD implementation of +>> ln and xargs. +> +> I wasn't aware of that, so thanks for spotting it and for your patch. +> +> The patch looks good to me. I've also tested on my GNU/Linux machine and +> it works fine. +> +> David, please consider the attached (format-)patch for inclusion into +> the upcoming release of Notmuch. + +This change LGTM. + +Tomi + +> +> Cheers. +> --=20 +> Stefano Zacchiroli . . . . . . . zack@upsilon.cc . . . . o . . . o . o +> Ma=C3=AEtre de conf=C3=A9rences . . . . . http://upsilon.cc/zack . . . o = +. . . o o +> Former Debian Project Leader . . @zack on identi.ca . . o o o . . . o . +> =C2=AB the first rule of tautology club is the first rule of tautology cl= +ub =C2=BB +> From 8641b7bc815d3a50a25069018faeb773b30499f2 Mon Sep 17 00:00:00 2001 +> From: Jack Peirce +> Date: Fri, 1 May 2015 10:32:05 +0200 +> Subject: [PATCH] notmuch-mutt: fix xargs/ln usage for OpenBSD compatibili= +ty +> +> - xargs: use -r flag instead of --no-run-if-empty +> - ln: use -I flag/3rd form of ln command instead of -t flag/4th form +> +> Signed-off-by: Stefano Zacchiroli +> --- +> contrib/notmuch-mutt/notmuch-mutt | 2 +- +> 1 file changed, 1 insertion(+), 1 deletion(-) +> +> diff --git a/contrib/notmuch-mutt/notmuch-mutt b/contrib/notmuch-mutt/not= +much-mutt +> index 126cbf4..b47b365 100755 +> --- a/contrib/notmuch-mutt/notmuch-mutt +> +++ b/contrib/notmuch-mutt/notmuch-mutt +> @@ -50,7 +50,7 @@ sub search($$$) { +> empty_maildir($maildir); +> system("notmuch search --output=3Dfiles $dup_option $query" +> . " | sed -e 's: :\\\\ :g'" +> - . " | xargs --no-run-if-empty ln -s -t $maildir/cur/"); +> + . " | xargs -r -I searchoutput ln -s searchoutput $maildir/cur/"); +> } +>=20=20 +> sub prompt($$) { +> --=20 +> 2.1.4 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch