[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] gnu: postgresql: Substitute hard coded "/bin/sh".
From: |
John Darrington |
Subject: |
Re: [PATCH] gnu: postgresql: Substitute hard coded "/bin/sh". |
Date: |
Fri, 25 Mar 2016 08:29:19 +0100 |
User-agent: |
Mutt/1.5.23 (2014-03-12) |
I committed it with the changes you suggested.
Thanks
On Thu, Mar 24, 2016 at 10:24:32PM +0100, Ricardo Wurmus wrote:
Hi John,
thanks for the patch! While the patch looks generally okay, I do want
to make a few nit-picking comments.
> * gnu/packages/databses.scm (postgresql): substitute /bin/sh
> with location of bash binary.
^
\_ why two spaces?
> (build-system gnu-build-system)
> + (arguments
> + `(#:phases
> + (modify-phases %standard-phases
> + (add-before
> + 'configure 'patch-/bin/sh
we usually keep these on the same line as ???add-before???.
> + (lambda* (#:key inputs #:allow-other-keys)
> + (let ((bash (assoc-ref inputs "bash")))
> + ;; Refer to the actual shell.
> + (substitute* '("src/bin/pg_ctl/pg_ctl.c"
> + "src/bin/psql/command.c")
> + (("/bin/sh")
> + (string-append bash "/bin/sh")))))))))
I think we could just do this:
(lambda _
(substitute* '(...)
(("/bin/sh") (which "sh")))
#t)
Also note the final ???#t??? because ???substitute*??? has an undetermined
return value.
What do you think?
~~ Ricardo
--
Avoid eavesdropping. Send strong encryted email.
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.
signature.asc
Description: Digital signature