[PATCH 1/2] gnu: postgresql: Substitute hard coded "/bin/sh".

[PATCH 1/2] gnu: postgresql: Substitute hard coded "/bin/sh".

[John Darrington]

* gnu/packages/databses.scm (postgresql): substitute /bin/sh
with location of  bash binary.
---
 gnu/packages/databases.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 25c1e6a..ff68d6f 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -283,6 +283,17 @@ as a drop-in replacement of MySQL.")
                (base32
                 "08ba951nfiy516flaw352shj1zslxg4ryx3w5k0adls1r682l8ix"))))
     (build-system gnu-build-system)
+    (arguments
+     '(#:phases (alist-cons-before
+                 'configure 'patch-/bin/sh
+                 (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")))))
+                 %standard-phases)))
     (inputs
      `(("readline" ,readline)
        ("zlib" ,zlib)))
-- 
2.1.4

Re: [PATCH 1/2] gnu: postgresql: Substitute hard coded "/bin/sh".

[Thompson, David]

On Thu, Mar 24, 2016 at 1:54 PM, John Darrington <jmd@gnu.org> wrote:
> * gnu/packages/databses.scm (postgresql): substitute /bin/sh
> with location of  bash binary.

Good catch!

> ---
>  gnu/packages/databases.scm | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
> index 25c1e6a..ff68d6f 100644
> --- a/gnu/packages/databases.scm
> +++ b/gnu/packages/databases.scm
> @@ -283,6 +283,17 @@ as a drop-in replacement of MySQL.")
>                 (base32
>                  "08ba951nfiy516flaw352shj1zslxg4ryx3w5k0adls1r682l8ix"))))
>      (build-system gnu-build-system)
> +    (arguments
> +     '(#:phases (alist-cons-before
> +                 'configure 'patch-/bin/sh
> +                 (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")))))
> +                 %standard-phases)))

Please use the 'modify-phases' syntax instead.  Search
gnu/packages/*.scm for many examples of its use.

>      (inputs
>       `(("readline" ,readline)
>         ("zlib" ,zlib)))
> --
> 2.1.4
>
>

Could you send an updated patch?  Thanks!

- Dave

[PATCH] gnu: postgresql: Substitute hard coded "/bin/sh".

[John Darrington]

* gnu/packages/databses.scm (postgresql): substitute /bin/sh
with location of  bash binary.
---
 gnu/packages/databases.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 25c1e6a..b67481f 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -283,6 +283,18 @@ as a drop-in replacement of MySQL.")
                (base32
                 "08ba951nfiy516flaw352shj1zslxg4ryx3w5k0adls1r682l8ix"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before
+          'configure 'patch-/bin/sh
+          (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")))))))))
     (inputs
      `(("readline" ,readline)
        ("zlib" ,zlib)))
-- 
2.1.4

Re: [PATCH] gnu: postgresql: Substitute hard coded "/bin/sh".

[Ricardo Wurmus]

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

Re: [PATCH] gnu: postgresql: Substitute hard coded "/bin/sh".

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 1735 bytes --]

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.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]