Re: 13/15: gnu: libreoffice: Fix ‘soffice’ in a pure environment.

Re: 13/15: gnu: libreoffice: Fix ‘soffice’ in a pure environment.

[Ludovic Courtès]

Hi!

guix-commits@gnu.org skribis:

> commit d5f344c987c8cc7b597e938c22e02edf1c4335f3
> Author: Tobias Geerinckx-Rice <me@tobias.gr>
> AuthorDate: Fri Feb 21 05:19:27 2020 +0100
>
>     gnu: libreoffice: Fix ‘soffice’ in a pure environment.
>     
>     * gnu/packages/libreoffice.scm (libreoffice)[arguments]: Refer to grep
>     and coreutils by absolute file name in the soffice launcher script.

[...]

> +               ;; Use store references for strictly necessary commands,
> +               ;; but not for optional tools like ‘gdb’ and ‘valgrind’.
> +               (for-each (lambda (command)
> +                           (substitute* "desktop/scripts/soffice.sh"
> +                             (((format #f"~a " command))
> +                              (format #f "~a " (which command)))))
> +                         (list "dirname" "grep" "uname"))

I strongly encourage using literal strings as patterns, it’s more
robust.  In this case, you could replace the ‘for-each’ expression with
something like (untested):

  (substitute* "desktop/scripts/soffice.sh"
    (("\\<(dirname|grep|uname)\\>" _ cmomand)
     (which command)))

WDYT?

Ludo’.

Re: 13/15: gnu: libreoffice: Fix ‘soffice’ in a pure environment.

[Tobias Geerinckx-Rice]

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

Ludo',

Ludovic Courtès 写道：
> I strongly encourage using literal strings as patterns, it’s 
> more
> robust.  In this case, you could replace the ‘for-each’ 
> expression with
> something like (untested):
>
>   (substitute* "desktop/scripts/soffice.sh"
>     (("\\<(dirname|grep|uname)\\>" _ cmomand)
>      (which command)))
>
> WDYT?

Yeah.  I use substitute*'s wonderful pattern matching all the 
time, probably more than most.  I have no idea why it didn't occur 
to me here.

I'll push this to staging, libreoffice users have been suffering 
enough rebuilds lately.

Thanks!

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]