[bug#30147] Simplify “scripts/guix”

[ludo@gnu.org (Ludovic Courtès)]

Mathieu Lirzin <mthl@gnu.org> skribis:

>>> From b6f8331455da1ffc4896b06cd2ee98e09b05be43 Mon Sep 17 00:00:00 2001
>>> From: Mathieu Lirzin <mthl@gnu.org>
>>> Date: Wed, 17 Jan 2018 19:55:49 +0100
>>> Subject: [PATCH 2/2] guix: Refactor script.
>>> MIME-Version: 1.0
>>> Content-Type: text/plain; charset=UTF-8
>>> Content-Transfer-Encoding: 8bit
>>>
>>> * scripts/guix.in: Use ‘and-let*’ and remove empty surrounding ‘let’.
>>> (run-guix-main, maybe-augment-load-paths!): Inline them.
>>
>> This is entirely subjective but I prefer the current style (in fact I
>> never use SRFI-2), so I’d rather skip this patch.  WDYT?  :-)
>
> I tried to avoid it, but the pipelining of checks for #f makes it very
> tempting to use it.  But indeed this is a matter of style, so let's not
> use it.
>
> Here is an alternative patch that beside the pedantic issue of replacing
>
>    (and updates-dir (file-exists? updates-dir))
>
> with
>
>    (and=> updates-dir file-exists?)
>
> removes the surrounding empty 'let' that doesn't make sense to me.
> Additionaly the compilation of the script is now possible which is
> convenient for basic syntax checks.  This is done by using the ‘-e main
> -s’ command-line switches.
>
> From 77379bbf2642762927c01cc7f10eb5761626f172 Mon Sep 17 00:00:00 2001
> From: Mathieu Lirzin <mthl@gnu.org>
> Date: Tue, 23 Jan 2018 12:52:33 +0100
> Subject: [PATCH] guix: Refactor script.
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> * scripts/guix.in: Remove empty surrounding ‘let’.  Define 'main' as the
> procedure called when running the script.
> (maybe-augment-load-paths!): Rename to ...
> (augment-load-paths!): ... this.  Use 'and=>' for 'file-exists?'.
> (run-guix-main): Rename to ...
> (main): ... this.  Call 'augment-load-paths!'.

Works for me.  Applied and pushed, thanks!

Ludo’.