Re: [PATCH 1/2] config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Jun 2, 2015, 20:17 UTC
- Message-ID
- <CAPig+cQsrxgMcK0+1jPLY8YXtNF4y17ivTUrFE8L8RS3MeffgA@mail.gmail.com>
- In-Reply-To
- <20150602200134.GA13382@peff.net>
On Tue, Jun 2, 2015 at 4:01 PM, Jeff King <peff@peff.net> wrote:
Show 12 quoted lines
> On Tue, Jun 02, 2015 at 03:57:44PM -0400, Eric Sunshine wrote: > >> > Oops, I missed the trailing '.' in the regex there, and it probably >> > needs double-quotes in case the inner expr fails to match anything. >> >> Which is messy considering the double quotes already surrounding >> $(uname_R). Suggestions? > > The shell should do the right thing with nested quotes inside backticks. > So just (untested): > > $(shell expr "`expr "$(uname_R)" : '\([0-9][0-9]*\.\)'`" '>=' 11),1)
Right. Temporary brain derailment on my part.
Show 5 quoted lines
>> I suppose the combination of `...` with built-in 'test' and built-in >> 'echo' would be the most efficient choice. Do you want it re-rolled? > > I can live with it either way. It's all pretty horrible and ugly; the > saving grace is that we hopefully never have to touch that line again.
I'll re-roll, taking advantage of `...` and (typically, builtin) 'test' and 'echo'. This:
$(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -ge 11 && echo 1)
Already tested on OS X 10.10 (Yosemite) and 10.5 (Leopard).