From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edz9M-0003Ed-KO for guix-patches@gnu.org; Tue, 23 Jan 2018 09:02:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edz9H-0005Yn-1l for guix-patches@gnu.org; Tue, 23 Jan 2018 09:02:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:59535) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edz9G-0005Ya-UO for guix-patches@gnu.org; Tue, 23 Jan 2018 09:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1edz9G-0005wi-Cn for guix-patches@gnu.org; Tue, 23 Jan 2018 09:02:02 -0500 Subject: [bug#30147] Simplify =?UTF-8?Q?=E2=80=9Cscripts/guix=E2=80=9D?= Resent-Message-ID: From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <87inc0i8yt.fsf@gnu.org> <87fu6x7x9m.fsf@gnu.org> <87efmg92si.fsf@gnu.org> Date: Tue, 23 Jan 2018 15:01:53 +0100 In-Reply-To: <87efmg92si.fsf@gnu.org> (Mathieu Lirzin's message of "Tue, 23 Jan 2018 13:29:17 +0100") Message-ID: <87bmhk7jxq.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Mathieu Lirzin Cc: 30147-done@debbugs.gnu.org Mathieu Lirzin skribis: >>> From b6f8331455da1ffc4896b06cd2ee98e09b05be43 Mon Sep 17 00:00:00 2001 >>> From: Mathieu Lirzin >>> 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=3DUTF-8 >>> Content-Transfer-Encoding: 8bit >>> >>> * scripts/guix.in: Use =E2=80=98and-let*=E2=80=99 and remove empty surr= ounding =E2=80=98let=E2=80=99. >>> (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=E2=80=99d 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=3D> 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 =E2=80=98-= e main > -s=E2=80=99 command-line switches. > > From 77379bbf2642762927c01cc7f10eb5761626f172 Mon Sep 17 00:00:00 2001 > From: Mathieu Lirzin > Date: Tue, 23 Jan 2018 12:52:33 +0100 > Subject: [PATCH] guix: Refactor script. > MIME-Version: 1.0 > Content-Type: text/plain; charset=3DUTF-8 > Content-Transfer-Encoding: 8bit > > * scripts/guix.in: Remove empty surrounding =E2=80=98let=E2=80=99. Defin= e 'main' as the > procedure called when running the script. > (maybe-augment-load-paths!): Rename to ... > (augment-load-paths!): ... this. Use 'and=3D>' for 'file-exists?'. > (run-guix-main): Rename to ... > (main): ... this. Call 'augment-load-paths!'. Works for me. Applied and pushed, thanks! Ludo=E2=80=99.