Received: (at 74962) by debbugs.gnu.org; 29 Dec 2024 02:35:49 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Dec 28 21:35:49 2024 Received: from localhost ([127.0.0.1]:53240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tRj9h-0001KM-6u for submit <at> debbugs.gnu.org; Sat, 28 Dec 2024 21:35:49 -0500 Received: from uggla.sjd.se ([178.174.241.107]:40368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <simon@HIDDEN>) id 1tRj9e-0001K9-QD for 74962 <at> debbugs.gnu.org; Sat, 28 Dec 2024 21:35:47 -0500 DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=ed2303; h=Content-Type:MIME-Version:Message-ID:In-Reply-To :Date:References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding :Content-ID:Content-Description; bh=p+xpHxsq/hHiAwcjkWVsX2G4xFq12VPF7H8bhXTDFs8=; t=1735439737; x=1736649337; b=RxyC1YR0VP1tnW14UWWAJdYZ72G8oZYi1DsD+WwV0rsq0S+SLXoU7tuR0H3FU/F5jmK3w+WdJpH VJKBWasgrBg==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=josefsson.org; s=rsa2303; h=Content-Type:MIME-Version:Message-ID: In-Reply-To:Date:References:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=p+xpHxsq/hHiAwcjkWVsX2G4xFq12VPF7H8bhXTDFs8=; t=1735439737; x=1736649337; b=hBCo5CC1HPU185OYMsZpVIluJ3HoqEcehyID+NLhRerwq5H/4irXcn+xaVnQw7hIlrfI5aYqyEF 6WPfXe0/LmoY6JYpHak/LU4hIeubBS3P9qpXZcLPUbv8SNsUhdWWTp1aDJR8mprIHGEnbrWt0X+0a T5VrXUEkwTFDBvj4uSjq/9Jou2xlyrsBgHST+FGE7UMb2pIaW/mxDnmon/+izMBfl7xLGdUJOlyf0 4gJsOUxLEO2oChCqfIGKVnV/CGSIbSXwh/dL68lbBtLM5JN22dTeBk86tBLcb5ERFf09IXN+Y62Fq 5y/s0T6jTXElbtHydHoFTQpTOOzVL1hYAuw096Q/m3GMgKt2GKrP4mNTT5xOEwTtkSj5a7wiFpRvO yaLRO30ZY1TpQkYLu9bcxmqJDjJynrHKMv82nVlePt48B4bzcjwXe9mEBKqennJlV3EJYnl7Q; Received: from h-178-174-130-130.a498.priv.bahnhof.se ([178.174.130.130]:41906 helo=kaka) by uggla.sjd.se with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from <simon@HIDDEN>) id 1tRj7M-00DV7b-5U; Sun, 29 Dec 2024 02:33:24 +0000 From: Simon Josefsson <simon@HIDDEN> To: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Subject: Re: [bug#74962] [PATCH v3 4/5] etc/guix-install.sh: Remove 'which' commands from requirements. References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN> <6d1f4ffaa70f4cfb3ed9e18b46fe3cedb44025f2.1734594333.git.maxim.cournoyer@HIDDEN> <878qs2zpaf.fsf@HIDDEN> <87v7v6tygi.fsf@HIDDEN> <87y0zzwxyf.fsf@HIDDEN> <877c7ji5qm.fsf@HIDDEN> OpenPGP: id=B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE; url=https://josefsson.org/key-20190320.txt X-Hashcash: 1:23:241229:janneke@HIDDEN::8i3pHUeV/b9ed04v:38QT X-Hashcash: 1:23:241229:ludo@HIDDEN::6f3Gxx4e/iSa8XtL:QRWP X-Hashcash: 1:23:241229:othacehe@HIDDEN::PHjiMQsE5L7R21A+:b5T+ X-Hashcash: 1:23:241229:dev@HIDDEN::aE1a+qJXH/9r+ki1:ejHs X-Hashcash: 1:23:241229:maxim.cournoyer@HIDDEN::Erb9Qlo3a3laa0q8:YOI5 X-Hashcash: 1:23:241229:74962 <at> debbugs.gnu.org::tXMVxjPXzuhlJplg:flib Date: Sun, 29 Dec 2024 03:33:46 +0100 In-Reply-To: <877c7ji5qm.fsf@HIDDEN> (Maxim Cournoyer's message of "Sun, 29 Dec 2024 11:26:57 +0900") Message-ID: <87ed1rjjzp.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74962 Cc: Mathieu Othacehe <othacehe@HIDDEN>, Ludovic =?iso-8859-1?Q?Court=E8s?= <ludo@HIDDEN>, 74962 <at> debbugs.gnu.org, Josselin Poiret <dev@HIDDEN>, Janneke Nieuwenhuizen <janneke@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Maxim Cournoyer <maxim.cournoyer@HIDDEN> writes: > Hi, > > Ludovic Court=C3=A8s <ludo@HIDDEN> writes: > >> Simon Josefsson <simon@HIDDEN> skribis: >> >>> Ludovic Court=C3=A8s <ludo@HIDDEN> writes: >>> >>>> Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis: >>>> >>>>> * etc/guix-install.sh (REQUIRE): Remove "which". Add "nologin". >>>>> (sys_create_build_user): Use 'type' instead of 'which'. >>>>> >>>>> Fixes: <https://issues.guix.gnu.org/74952> >>>>> Reported-by: Simon Josefsson <simon@HIDDEN> >>>>> Change-Id: I0675716bab3fc22d3289ee7af2cb0ab33a1cee71 >>>> >>>> LGTM. >>> >>> Using 'type -P' is not POSIX and neither /bin/dash nor /bin/gash >>> supports it. It seems like a GNU bash extension. Is that okay? >> >> Oh, not great. From what you write, I=E2=80=99m not sure what to conclu= de; >> just skip this patch and be done with it? > > We currently use other Bash-specific features, so I think it's fine to > embrace the Bash requirement instead of shying away from it. > > If we decide that we don't want Bash as a requirement at some point, > we'll have to change a bunch of things; one of them would be to no > longer make use of arrays since POSIX shells don't have them, for > example. There is a difference to use bashisms in code in Guix intended to be run on bash, and code we have in the manual that is suggested to be used on other operating system as part of the Guix installation process. There appears to be no perfect solution here. I think 'command -v nologin' is the closest. Or just keep the code as-is and use 'which', but that caused my initial problem (lack of 'which'). I'd like to second-guess why we even bother with using "nologin" instead of simply hard-coding "/bin/false" or why not "/" which I suppose is not a executable shell on any system. /Simon --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIoEARYIADIWIQSjzJyHC50xCrrUzy9RcisI/kdFogUCZ3C1CxQcc2ltb25Aam9z ZWZzc29uLm9yZwAKCRBRcisI/kdFosZsAP97gBlaJ9EzzMpPMi/IJqAjNNTkJZtW JfKtyg9fFEqqTQD/XSMCekay/9/i7lwM41YfehhnMdrwgPIZ3FFc+hzG0QA= =hyVe -----END PGP SIGNATURE----- --=-=-=--
guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.Received: (at 74962) by debbugs.gnu.org; 29 Dec 2024 02:35:33 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Dec 28 21:35:33 2024 Received: from localhost ([127.0.0.1]:53236 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tRj9Q-0001JX-Iw for submit <at> debbugs.gnu.org; Sat, 28 Dec 2024 21:35:33 -0500 Received: from mail-pj1-f51.google.com ([209.85.216.51]:50270) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1tRj9N-0001JK-Hm for 74962 <at> debbugs.gnu.org; Sat, 28 Dec 2024 21:35:30 -0500 Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2f42992f608so8392536a91.0 for <74962 <at> debbugs.gnu.org>; Sat, 28 Dec 2024 18:35:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735439669; x=1736044469; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oVezi2yoAy7YGV5Aq446MC+Rv3LmhsZEtcJ4VrXDW9w=; b=gzft0Ysbi+Q7JvVBc9tucv18jMXwvSAuUmy6Dh2RZIa2zUxZwxs/Ol6zVaYQSdI42P xZpUMj9xwa0txEUB3moPms/yFW4/PVj6DAASI8e4jmFBHYtukIB6leqyg/Zo6RLKrAMQ 92jhGem6Kn+dCpt7lYv3CPUXXesVChEJvedZ18lYevBo/Rmh6mhIACIdIpRCXv0AdzU+ p/XBuHMtS7wHC0Di+ZXwwo2zJtDJ+Yea1+T7dTr0NkhR/ZSwOixvtP1eOuZ6bfgO+kDj etl9gpfIkmuRdHXxo42xFaL5d3Va9aMVWK5soKzsYnsNpdxQ4C5FrYtdZSjTi6aM1pFB CmaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735439669; x=1736044469; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=oVezi2yoAy7YGV5Aq446MC+Rv3LmhsZEtcJ4VrXDW9w=; b=lUB/pDODrs4I+0OgUyQUdvkI5GB9APo8GwCjtEJlGh6Ds/ZRA4BimfFsoF0gBM0kqH lDBSnijHMoAZDFJ/RUxcwa/aNfhej06cePUMJxfYkkLMwVlzJidb9NcaDI83z8caEeD5 Fu9aeyS7CbZAwfWp8OAGRIMlqa4xM0VmdYiP+5CC+RgAFWAiT21gWAc5rRLF0hvG58c4 lUU0gzKp1Br/3nwlM0EmNiNtoCS9x7ZHa796TAOheNfmsDc31f4JCnTQc3PlzpgDssvU qvKVnY8TMKf4BpG2NUDWLSfGHBkw1/F17htyhWzeqklBXesdsHjB5CaRkPUXZzcEpYS9 UwUg== X-Forwarded-Encrypted: i=1; AJvYcCUNEPVX2zLWCH7J9KKD6Lt/A3wukAY+FD1LG8GcNy8bWTTuUqWsfFf/lNbPRrsj/XUEU+JpAw==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yyf6lN+fIqiak5t56/VzBNGk2jVkHE7KojYL8K8Ql+PX9DQLMes 6Ef0IOmJqwHgWtRIybks00696sn0GCsQqU8UfEy53VZ1p8Su3ujN X-Gm-Gg: ASbGnctDeklHlRjqEap2K/6wEiFMJbGtITgD/eJcbpevN/vkhGZYsTrp9+WJaazgKQ/ LWlcDJZBhOGKlB6JqQ9l5Gz/2VJ9IarY2D7Z10oToCnwzXjeFX1liLHi/EibyUzlAvS+7ywGuSK wl58HZoacakFmc1DOXA92xMUKaxUUC/ypsSGz7avrQbcEtlC4Fa+DLxZG5gPE3I5gBni5thCu/J GTuy1S9GOKc3c1bFysObNU69+d0mNJy25R7eKS3XXFEjtUwo7JViQ== X-Google-Smtp-Source: AGHT+IG9NyWUOsZBeI1g8IYTDaYKSzxglMQwadaxGlJ5coSEk111k4XYVbmCAkq9E2t1hboZWAxcOw== X-Received: by 2002:a17:90b:54c6:b0:2f4:434d:c7f0 with SMTP id 98e67ed59e1d1-2f452e22c43mr58209364a91.12.1735439668716; Sat, 28 Dec 2024 18:34:28 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc96eac6sm156680735ad.80.2024.12.28.18.34.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Dec 2024 18:34:28 -0800 (PST) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: Simon Josefsson <simon@HIDDEN> Subject: Re: [bug#74962] [PATCH v3 4/5] etc/guix-install.sh: Remove 'which' commands from requirements. In-Reply-To: <87v7v6tygi.fsf@HIDDEN> (Simon Josefsson's message of "Thu, 26 Dec 2024 13:34:21 +0100") References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN> <6d1f4ffaa70f4cfb3ed9e18b46fe3cedb44025f2.1734594333.git.maxim.cournoyer@HIDDEN> <878qs2zpaf.fsf@HIDDEN> <87v7v6tygi.fsf@HIDDEN> Date: Sun, 29 Dec 2024 11:34:17 +0900 Message-ID: <8734i7i5ee.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74962 Cc: Mathieu Othacehe <othacehe@HIDDEN>, Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, 74962 <at> debbugs.gnu.org, Josselin Poiret <dev@HIDDEN>, Janneke Nieuwenhuizen <janneke@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi Simon, Simon Josefsson <simon@HIDDEN> writes: > Ludovic Court=C3=A8s <ludo@HIDDEN> writes: > >> Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis: >> >>> * etc/guix-install.sh (REQUIRE): Remove "which". Add "nologin". >>> (sys_create_build_user): Use 'type' instead of 'which'. >>> >>> Fixes: <https://issues.guix.gnu.org/74952> >>> Reported-by: Simon Josefsson <simon@HIDDEN> >>> Change-Id: I0675716bab3fc22d3289ee7af2cb0ab33a1cee71 >> >> LGTM. > > Using 'type -P' is not POSIX and neither /bin/dash nor /bin/gash > supports it. It seems like a GNU bash extension. Is that okay? I think it's OK, since we currently mandate Bash, but we could use 'command -v the-command > /dev/null' for the same result, which *is* POSIX, so perhaps we should use that instead. > The snippet ends up in the manual as recommendations for users to run on > different operating systems. We may want to assume GNU bash to favor > it, but I'm not sure if that is really helping users. > > If 'type -P' is used, shouldn't that really be 'type -fP' to avoid shell > function expansion? It isn't all that clear from the man page if -f is > still needed for -P or not: > > https://manpages.debian.org/bookworm/bash/bash.1.en.html#type I think we'd have to use -f if we want to guard against shell functions being found instead; but maybe then it's simpler and clearer to just use 'command -v' as I mentioned above. > Even so 'type' uses hashed names, do they survive sub-shell $() > execution? If type is to be used, maybe this should be: > > $(hash -r nologin && type -Pf nologin) > > My suggestion was to use 'command -v nologin' which behaviour is > standard POSIX /bin/sh. I acknowledge that it has the trouble of > expanding to an alias if the shell had 'nologin' aliases somehow > (unlikely but not impossible). I agree; I'll make the change. Perhaps adjust the other 'type' usages also (there was only 2). > $(unalias nologin; command -v nologin) > > It seems all of the options (which, type -P, command -v) has another > unwanted property: if 'nologin' is not available in the path, these > commands expand to the empty string, and that empty string gets passed > to 'useradd -s STR -c ...' and the user gets an ugly error message about > '-c' not being a proper shell. Yuck. > I wonder what all this solves compared to hard-coding "/" as the login > shell for the guixbuild user? > > Here is source code for nologin, which we seem to make some effort to > use - is this better than 'false'? > > https://github.com/shadow-maint/shadow/blob/master/src/nologin.c It seems marginally better than using 'false' in that it logs something to syslog when a login is attempted and fail :-). > At least I'm happy nobody wants to keep using 'which'. > > I am sorry for the rabbit hole :) Thanks for the comments. I'll send a reworked version. --=20 Thanks, Maxim
guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.
Received: (at 74962) by debbugs.gnu.org; 29 Dec 2024 02:28:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Dec 28 21:28:17 2024
Received: from localhost ([127.0.0.1]:53223 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tRj2P-0000oq-Cl
for submit <at> debbugs.gnu.org; Sat, 28 Dec 2024 21:28:17 -0500
Received: from mail-pl1-f169.google.com ([209.85.214.169]:54301)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tRj2M-0000oS-Nx
for 74962 <at> debbugs.gnu.org; Sat, 28 Dec 2024 21:28:15 -0500
Received: by mail-pl1-f169.google.com with SMTP id
d9443c01a7336-2163bd70069so1394735ad.0
for <74962 <at> debbugs.gnu.org>; Sat, 28 Dec 2024 18:28:14 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1735439229; x=1736044029; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:user-agent:message-id:date
:references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=wLTS6GPAFUFzHrjyHzOKQICnrs5g05GckRHkBZAhLbg=;
b=RIKMdQMw5LFd4pJfx1iTr8xjEyxnBKCoMS+qJu7qC0pdR8YJwqA5dr4xmdbnKWU2Fz
YdJuCLNIXU8RTg9Y2o+imgtXQRNcZj9n8m37JNyP1krPIwruGyiMiWejsgAPAzkqa41O
pKPJd5dYFIYQ8vTshK5yhqonMwb2Aal14vUuXQi2NFCZw3LzoEJAV6jWS3Qggidy9Cov
C2CHaEtMFX76YdEnXi0JrP1P6HDxARgp9cKjrLfl2+XjVRb3MSHqORJbXTXYApQ0c89F
Tk8TrZQiyrmDm2ySTLToYSwR1QRuhVtoMNa5ELZObcUJbdbc28n5PdzHd/D3Q5/VI45E
maAg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1735439229; x=1736044029;
h=content-transfer-encoding:mime-version:user-agent:message-id:date
:references:in-reply-to:subject:cc:to:from:x-gm-message-state:from
:to:cc:subject:date:message-id:reply-to;
bh=wLTS6GPAFUFzHrjyHzOKQICnrs5g05GckRHkBZAhLbg=;
b=s3H7H3XYMoy7wXoYdE/c/fDGMFgtldYIL19aA72eyrHjtFssLiBwc3eqfo7HmEh2+a
WayPhdiOpi4jCGxtNPV3RzYIBKR+cwKVyStO1ofB4foBXZIrn/76MeWmaluUoTAL64D/
qHT5kwYC5jOc5OZqxUCNffK18aULNXuS+q3EdX64wmeDhoAhdr4XUh57ICGbiY2WMb1A
tJ+h+X/DP2z4sxpnFIhEGBwYiHkKftk8sk4F4DszROFl4aMgccMSzLjyZOtVcUjYd2rA
8maFm3eoqa0OUQWS12UdQOxtyvIbVOmD29YqT6djVDuoJ7jPGiswKcHN5MQrq8GNKjZ4
qZ8A==
X-Forwarded-Encrypted: i=1;
AJvYcCXW8/jSDKxoi6RxqlnrqV070S2Ni3dgyxpjPVR5TOFTk+bovVaLkY5lAGgVprKNmLIjNcVXlQ==@debbugs.gnu.org
X-Gm-Message-State: AOJu0YxMwE4K37bgN9+HY+WXBqGC42gndCzbzVxERYsKTuJZhEWFdYFF
nZshQDLU6Rqy6VJGPdnkzZ2N0DUn5XgzVNZN73hag1WvY1Fpzb2iXHt/003qG/g=
X-Gm-Gg: ASbGncs+jrb0+91w7s0JE1efJPDhOOPrHKg/sbRcE1pBNbOe5gEDrUCmLAkCZLeVfIE
RtQL9qda9mv/m4wfYa79Rf8lCuK+BWc/r0XATQZ0bBg5xyxuCaiDoGZuGAHRmffugR97zXjgOEU
CcIXOGdfxOJK6mQk349wHGPotnqPC+/rvZgXjytmr3HKxSQ1uaGNdUNbkwEjimHcX7Zdc31lv5Q
kdCkQRx+HGZ/Fy6LdUhEq1UDmVrWS9KyEw9cX+hOViweSyQwXxrIQ==
X-Google-Smtp-Source: AGHT+IGfTn2narg8Q/xanD1GHBmpbsiBY15aUw4cCHdM8euaiCM3STvd/1vRZJfK29CrStXDEdKhPw==
X-Received: by 2002:a17:902:e54e:b0:216:7ee9:2222 with SMTP id
d9443c01a7336-219e6f13c45mr459058315ad.35.1735439229128;
Sat, 28 Dec 2024 18:27:09 -0800 (PST)
Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-219dc9f4fbcsm155964915ad.174.2024.12.28.18.27.06
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 28 Dec 2024 18:27:08 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#74962] [PATCH v3 4/5] etc/guix-install.sh: Remove 'which'
commands from requirements.
In-Reply-To: <87y0zzwxyf.fsf@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?=
=?utf-8?Q?s?= message of "Sat, 28 Dec 2024 17:53:44 +0100")
References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN>
<6d1f4ffaa70f4cfb3ed9e18b46fe3cedb44025f2.1734594333.git.maxim.cournoyer@HIDDEN>
<878qs2zpaf.fsf@HIDDEN> <87v7v6tygi.fsf@HIDDEN>
<87y0zzwxyf.fsf@HIDDEN>
Date: Sun, 29 Dec 2024 11:26:57 +0900
Message-ID: <877c7ji5qm.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74962
Cc: Simon Josefsson <simon@HIDDEN>, Josselin Poiret <dev@HIDDEN>,
Mathieu Othacehe <othacehe@HIDDEN>, 74962 <at> debbugs.gnu.org,
Janneke Nieuwenhuizen <janneke@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
Ludovic Court=C3=A8s <ludo@HIDDEN> writes:
> Simon Josefsson <simon@HIDDEN> skribis:
>
>> Ludovic Court=C3=A8s <ludo@HIDDEN> writes:
>>
>>> Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis:
>>>
>>>> * etc/guix-install.sh (REQUIRE): Remove "which". Add "nologin".
>>>> (sys_create_build_user): Use 'type' instead of 'which'.
>>>>
>>>> Fixes: <https://issues.guix.gnu.org/74952>
>>>> Reported-by: Simon Josefsson <simon@HIDDEN>
>>>> Change-Id: I0675716bab3fc22d3289ee7af2cb0ab33a1cee71
>>>
>>> LGTM.
>>
>> Using 'type -P' is not POSIX and neither /bin/dash nor /bin/gash
>> supports it. It seems like a GNU bash extension. Is that okay?
>
> Oh, not great. From what you write, I=E2=80=99m not sure what to conclud=
e;
> just skip this patch and be done with it?
We currently use other Bash-specific features, so I think it's fine to
embrace the Bash requirement instead of shying away from it.
If we decide that we don't want Bash as a requirement at some point,
we'll have to change a bunch of things; one of them would be to no
longer make use of arrays since POSIX shells don't have them, for
example.
--=20
Thanks,
Maxim
guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.Received: (at 74962) by debbugs.gnu.org; 28 Dec 2024 16:54:00 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Dec 28 11:54:00 2024 Received: from localhost ([127.0.0.1]:52460 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tRa4e-0006iJ-Dv for submit <at> debbugs.gnu.org; Sat, 28 Dec 2024 11:54:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51516) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tRa4b-0006i3-Cy for 74962 <at> debbugs.gnu.org; Sat, 28 Dec 2024 11:53:58 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1tRa4S-0006cQ-Iw; Sat, 28 Dec 2024 11:53:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=M6b5pjRvR6d5G0/ZGhn7JmH8enB3uXHyBN38wMLrPIQ=; b=g4px7t35GHIfHW/pDd9N c9kf+A9zTOxNP7A1zwpRaEiLjlz5aG4L0vPQxXNX0P3i7qpdKPyh3zunpGRfxHylxhvz8B7BGd0nB jPa8+J3+5AiuvSL2i0CVquxfCUFxFZDp0uVQnppV6qSYriNVNy7B+6ioRUikrT4SVHT8H8Dewbp0O LeA7cnUcGFftdgF7/VW8R8Q0ePffWVFrwNnA9M9qONjSaaYtmI5Q2hKPwbzQAQeBxX8R3lDEZe+vw lLSYyee7hFCeAHy6Yg9dKFbL+lbzwv7hddWBhhl/W1/BfG/639M4i3tmJV0BrBJ1e0/PFtXZyGI1v 2kyBGeyBOnryIw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Simon Josefsson <simon@HIDDEN> Subject: Re: [bug#74962] [PATCH v3 4/5] etc/guix-install.sh: Remove 'which' commands from requirements. In-Reply-To: <87v7v6tygi.fsf@HIDDEN> (Simon Josefsson's message of "Thu, 26 Dec 2024 13:34:21 +0100") References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN> <6d1f4ffaa70f4cfb3ed9e18b46fe3cedb44025f2.1734594333.git.maxim.cournoyer@HIDDEN> <878qs2zpaf.fsf@HIDDEN> <87v7v6tygi.fsf@HIDDEN> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Octidi 8 =?utf-8?Q?Niv=C3=B4se?= an 233 de la =?utf-8?Q?R=C3=A9volution=2C?= jour du Fumier X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sat, 28 Dec 2024 17:53:44 +0100 Message-ID: <87y0zzwxyf.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74962 Cc: Mathieu Othacehe <othacehe@HIDDEN>, Josselin Poiret <dev@HIDDEN>, 74962 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Janneke Nieuwenhuizen <janneke@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Simon Josefsson <simon@HIDDEN> skribis: > Ludovic Court=C3=A8s <ludo@HIDDEN> writes: > >> Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis: >> >>> * etc/guix-install.sh (REQUIRE): Remove "which". Add "nologin". >>> (sys_create_build_user): Use 'type' instead of 'which'. >>> >>> Fixes: <https://issues.guix.gnu.org/74952> >>> Reported-by: Simon Josefsson <simon@HIDDEN> >>> Change-Id: I0675716bab3fc22d3289ee7af2cb0ab33a1cee71 >> >> LGTM. > > Using 'type -P' is not POSIX and neither /bin/dash nor /bin/gash > supports it. It seems like a GNU bash extension. Is that okay? Oh, not great. From what you write, I=E2=80=99m not sure what to conclude; just skip this patch and be done with it? Thanks! Ludo=E2=80=99.
guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.
Received: (at 74962) by debbugs.gnu.org; 26 Dec 2024 12:36:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 26 07:36:29 2024
Received: from localhost ([127.0.0.1]:40410 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tQn6L-0003so-8s
for submit <at> debbugs.gnu.org; Thu, 26 Dec 2024 07:36:29 -0500
Received: from uggla.sjd.se ([178.174.241.107]:43242)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <simon@HIDDEN>) id 1tQn6H-0003sd-QC
for 74962 <at> debbugs.gnu.org; Thu, 26 Dec 2024 07:36:27 -0500
DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed;
d=josefsson.org; s=ed2303; h=Content-Type:MIME-Version:Message-ID:In-Reply-To
:Date:References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding
:Content-ID:Content-Description;
bh=/qu8Xvpw8b5hODe51Oth7avasPD+YkRTKAAJLx5FN8E=; t=1735216577; x=1736426177;
b=o0KrgrnHcKHHrtFf91oOCrHtmLgxCfl9KXb6IBvMSYxsCSPgdSeyMXqOgUNc7R+Kzdr4oc2ldZe
5FjGDIjZbCQ==;
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
d=josefsson.org; s=rsa2303; h=Content-Type:MIME-Version:Message-ID:
In-Reply-To:Date:References:Subject:Cc:To:From:Sender:Reply-To:
Content-Transfer-Encoding:Content-ID:Content-Description;
bh=/qu8Xvpw8b5hODe51Oth7avasPD+YkRTKAAJLx5FN8E=; t=1735216577; x=1736426177;
b=MucQne9acVAss1VgIj03hkJ81O2tcTnCFbDuwDH3FWteKfpjJKY2rpC9oiNWYBongtUWcPEN66d
2wbYihctRbIqUNOIF8QshaxwPUvQDwTmekql1IjhOvQ6x+tC/BaGdQjia3p+jkmP3dsix7cuFL/w0
huGHLrLKK9ZFbyYoZeRtK/wQFTVsM7UhkgwTbB4pZgESSjq39PsQyW/MvL9UUDldqkY96cFPBSmdH
Z6PItnfMT8LpiBAXiH14uZi6NT0oXrnFNEkaTubIst8/L7EwjV7BLp4Fsk69JY8iY0YA5Mtuk3AF8
zDg5RbwSoadrJwRTn4lyvnfvqHVIY6rVQI/m1Vvv6DwUVxFyu6ZtCDJ8+PsSTZaS/IxIckLHThiVC
1SIBmvuOU8MAfJLdtklmCK74SY24dxADUK4EggI783SFqQm0MuhOrvweNH1PzWb252sl3NYJS;
Received: from h-178-174-130-130.a498.priv.bahnhof.se ([178.174.130.130]:44698
helo=kaka) by uggla.sjd.se with esmtpsa (TLS1.3) tls
TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95)
(envelope-from <simon@HIDDEN>) id 1tQn3y-008wZp-NN;
Thu, 26 Dec 2024 12:34:02 +0000
From: Simon Josefsson <simon@HIDDEN>
To: Ludovic =?iso-8859-1?Q?Court=E8s?= <ludo@HIDDEN>
Subject: Re: [bug#74962] [PATCH v3 4/5] etc/guix-install.sh: Remove 'which'
commands from requirements.
References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN>
<6d1f4ffaa70f4cfb3ed9e18b46fe3cedb44025f2.1734594333.git.maxim.cournoyer@HIDDEN>
<878qs2zpaf.fsf@HIDDEN>
OpenPGP: id=B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE;
url=https://josefsson.org/key-20190320.txt
X-Hashcash: 1:23:241226:janneke@HIDDEN::8I0E3B0AR0G/VVzW:0RBD
X-Hashcash: 1:23:241226:maxim.cournoyer@HIDDEN::peCyNjUwCb4remMh:1RT4
X-Hashcash: 1:23:241226:othacehe@HIDDEN::zYEzYsh+ZkDYugby:Wk6R
X-Hashcash: 1:23:241226:74962 <at> debbugs.gnu.org::KV2gWTkIDvItk1G/:Q4GJ
X-Hashcash: 1:23:241226:ludo@HIDDEN::6KSm0tCj+InqVTpl:0hMMI
X-Hashcash: 1:23:241226:dev@HIDDEN::Ot6OC9rrZCBhOjKa:0/hRe
Date: Thu, 26 Dec 2024 13:34:21 +0100
In-Reply-To: <878qs2zpaf.fsf@HIDDEN> ("Ludovic =?iso-8859-1?Q?Court=E8s?=
=?iso-8859-1?Q?=22's?= message of "Thu, 26
Dec 2024 11:55:52 +0100")
Message-ID: <87v7v6tygi.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha256; protocol="application/pgp-signature"
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 74962
Cc: Mathieu Othacehe <othacehe@HIDDEN>, Josselin Poiret <dev@HIDDEN>,
74962 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer@HIDDEN>,
Janneke Nieuwenhuizen <janneke@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
--=-=-=
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
Ludovic Court=E8s <ludo@HIDDEN> writes:
> Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis:
>
>> * etc/guix-install.sh (REQUIRE): Remove "which". Add "nologin".
>> (sys_create_build_user): Use 'type' instead of 'which'.
>>
>> Fixes: <https://issues.guix.gnu.org/74952>
>> Reported-by: Simon Josefsson <simon@HIDDEN>
>> Change-Id: I0675716bab3fc22d3289ee7af2cb0ab33a1cee71
>
> LGTM.
Using 'type -P' is not POSIX and neither /bin/dash nor /bin/gash
supports it. It seems like a GNU bash extension. Is that okay?
The snippet ends up in the manual as recommendations for users to run on
different operating systems. We may want to assume GNU bash to favor
it, but I'm not sure if that is really helping users.
If 'type -P' is used, shouldn't that really be 'type -fP' to avoid shell
function expansion? It isn't all that clear from the man page if -f is
still needed for -P or not:
https://manpages.debian.org/bookworm/bash/bash.1.en.html#type
Even so 'type' uses hashed names, do they survive sub-shell $()
execution? If type is to be used, maybe this should be:
$(hash -r nologin && type -Pf nologin)
My suggestion was to use 'command -v nologin' which behaviour is
standard POSIX /bin/sh. I acknowledge that it has the trouble of
expanding to an alias if the shell had 'nologin' aliases somehow
(unlikely but not impossible).
$(unalias nologin; command -v nologin)
It seems all of the options (which, type -P, command -v) has another
unwanted property: if 'nologin' is not available in the path, these
commands expand to the empty string, and that empty string gets passed
to 'useradd -s STR -c ...' and the user gets an ugly error message about
'-c' not being a proper shell.
I wonder what all this solves compared to hard-coding "/" as the login
shell for the guixbuild user?
Here is source code for nologin, which we seem to make some effort to
use - is this better than 'false'?
https://github.com/shadow-maint/shadow/blob/master/src/nologin.c
At least I'm happy nobody wants to keep using 'which'.
I am sorry for the rabbit hole :)
/Simon
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iIoEARYIADIWIQSjzJyHC50xCrrUzy9RcisI/kdFogUCZ21NTRQcc2ltb25Aam9z
ZWZzc29uLm9yZwAKCRBRcisI/kdFopggAQDsIUbv8X5pdDbB4mtA55zslyBdRM3v
J2zjK+ZlqF/MNwEAltO/yhYI+lvUiapnzTFNrAcBP/7aOAfhpn/0aR86EAk=
=ZRWV
-----END PGP SIGNATURE-----
--=-=-=--
guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.Received: (at 74962) by debbugs.gnu.org; 26 Dec 2024 11:00:29 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 26 06:00:29 2024 Received: from localhost ([127.0.0.1]:40247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tQlbQ-0007lx-R5 for submit <at> debbugs.gnu.org; Thu, 26 Dec 2024 06:00:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46994) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tQlbO-0007lk-H5 for 74962 <at> debbugs.gnu.org; Thu, 26 Dec 2024 06:00:27 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1tQlbJ-0000Ut-1L; Thu, 26 Dec 2024 06:00:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=3x3DqRt6JpRnV2pgO/9X9nwiSMgXsO+bXpbaI53nZak=; b=fhT3EDkoSmWNNayEvLeu +M2tHGuph6xsqplapVEwONEIPUF9Mje2KpSv3pknDxhd6EZMjUW8kbGvpDjhEOxgN8vEMGukywicl yaCK/Y9Etd7NF1LDb4+sl2MHiW6YLm8blfKi3M3FOXt7a3KdOnOdXrSfyAosjMu570HmCuBQqEAYs 3CCjuJsRRbokuzLwwTAB6aGQKewrGOgqBp90oDNE0Z9M73M1chxb5gB33EGxSMYM/L3LPmdotLHp+ f8KIUQ5pxyzLCDUEsCWFlbN82cfUs9OAhM8R7oXRnki0Y0PqFOCrRcOFDCOba1fn7J9jE5s0krAaR Rq85Mpg72+IHvw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Subject: Re: [bug#74962] [PATCH v3 5/5] etc/guix-install.sh: Sort requirements. In-Reply-To: <027645209ae74112b8b70749ab23042a26ad99d6.1734594333.git.maxim.cournoyer@HIDDEN> (Maxim Cournoyer's message of "Thu, 19 Dec 2024 16:45:33 +0900") References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN> <027645209ae74112b8b70749ab23042a26ad99d6.1734594333.git.maxim.cournoyer@HIDDEN> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Sextidi 6 =?utf-8?Q?Niv=C3=B4se?= an 233 de la =?utf-8?Q?R=C3=A9volution=2C?= jour de la Lave X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Thu, 26 Dec 2024 12:00:15 +0100 Message-ID: <87zfkiyaio.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74962 Cc: Mathieu Othacehe <othacehe@HIDDEN>, Josselin Poiret <dev@HIDDEN>, 74962 <at> debbugs.gnu.org, Janneke Nieuwenhuizen <janneke@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis: > * etc/guix-install.sh (REQUIRE): Sort. > > Change-Id: I59c57da31cd3846cf21810d5978d7d32516e0868 LGTM.
guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.Received: (at 74962) by debbugs.gnu.org; 26 Dec 2024 10:56:26 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 26 05:56:26 2024 Received: from localhost ([127.0.0.1]:40235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tQlXW-0007YE-75 for submit <at> debbugs.gnu.org; Thu, 26 Dec 2024 05:56:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tQlXT-0007Y0-QA for 74962 <at> debbugs.gnu.org; Thu, 26 Dec 2024 05:56:24 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1tQlXO-00007a-H7; Thu, 26 Dec 2024 05:56:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=HB7+zRJORCoY1MIO3v/uKFBzfI+4kJi8WBweit7OsLc=; b=F4FH7bWRvgDbqW7SrtbU n/RQZdbhqE7soVsUawHDjZYg20QhlYb7nQbs0hYTqacGeRENsw2opmvsk8b26kyJcMxHXs/MHq4Ba Jvq9gHQ6fXGfoa4YGik6xtbgG43v+EwbsOoot31+rLPFKIHk3SPTatoC1vCw6aAAozdIvOyLfkS+A h/+JxOtATGRGO6fcuqxgKHb92ivkOSwqPC+6vxlT3EuugyhR2MgG/uhJ5f24AbLEG/miXGCn9e0Ia sXXrkQypsWN6XvKMIC0NupFcolJH+kPAObQ6DAZKi2J6IC9wJHMAMZtSqEsEkhLmr0cvz3LFLIUS1 IpaWJX05luZRiQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Subject: Re: [bug#74962] [PATCH v3 3/5] etc/guix-install.sh: Fix quoting and other issues. In-Reply-To: <093604124092d3b024127068cbbeff3f9aa62d76.1734594333.git.maxim.cournoyer@HIDDEN> (Maxim Cournoyer's message of "Thu, 19 Dec 2024 16:45:31 +0900") References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN> <093604124092d3b024127068cbbeff3f9aa62d76.1734594333.git.maxim.cournoyer@HIDDEN> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Sextidi 6 =?utf-8?Q?Niv=C3=B4se?= an 233 de la =?utf-8?Q?R=C3=A9volution=2C?= jour de la Lave X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Thu, 26 Dec 2024 11:56:15 +0100 Message-ID: <874j2qzp9s.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74962 Cc: Mathieu Othacehe <othacehe@HIDDEN>, Josselin Poiret <dev@HIDDEN>, 74962 <at> debbugs.gnu.org, Janneke Nieuwenhuizen <janneke@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis: > This change fixes most issues reported by the 'shellcheck' command. > > * etc/guix-install.sh (add_init_sys_require): Use -n instead of ! -z. > (sys_create_build_user): Quote variable expansion. > (sys_delete_build_user): Likewise. > (sys_create_shell_completion): Likewise. > (sys_delete_user_profiles): Likewise. > (sys_delete_guix_daemon): Explicitly access first array item. > (sys_create_store): Update shellcheck code to ignore. > (SYSV_INIT_REQUIRE): Ignore unused warning. > (sys_customize_bashrc): Ignore warnings due to using variables inside a > literal. > (main): Replace $@ with $* inside string. > > Change-Id: Ia88509b461b3844f2dd5abf9fb21a5b2bbb8a1e1 LGTM.
guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.Received: (at 74962) by debbugs.gnu.org; 26 Dec 2024 10:56:05 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 26 05:56:05 2024 Received: from localhost ([127.0.0.1]:40231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tQlXA-0007Xf-OG for submit <at> debbugs.gnu.org; Thu, 26 Dec 2024 05:56:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tQlX9-0007Wx-1A for 74962 <at> debbugs.gnu.org; Thu, 26 Dec 2024 05:56:03 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1tQlX2-00006f-UT; Thu, 26 Dec 2024 05:55:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=uJMqMBdT4gY4hOzD1+SrXZBLVWaOyv6H2jW/MBGFHgI=; b=ADcTb0FNpBunEueVQ2KV f++XR9YYJQsH3KANqv/R+JqEr20SwXG5uwzUCdAq8/1BsnVOVUK8cFOaMFn8Gyq3/A8C0eJHuzjz9 K9SyVKog/vbEYoOcHltu2m4+rnlKb1vUsFD9gSkDKLD0P/Qk91YyyG/Lqub9t5tcWIckXyNDMtfbJ N85tzYeyPcayqjmiPORNcxu01euSKIH2soQHrnpof635TprkiF+bJ1lSNztxg3QoBMX4gfQMghTOu 2WABLesqYl7bpIOuIa7ljDmdHFXBWxS7KnfRvaZLlL2gZEePnpD68c1jajdt9rQFxa6Uyg/3cSfgw WGAzBLA82nTlZA==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Subject: Re: [bug#74962] [PATCH v3 4/5] etc/guix-install.sh: Remove 'which' commands from requirements. In-Reply-To: <6d1f4ffaa70f4cfb3ed9e18b46fe3cedb44025f2.1734594333.git.maxim.cournoyer@HIDDEN> (Maxim Cournoyer's message of "Thu, 19 Dec 2024 16:45:32 +0900") References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN> <6d1f4ffaa70f4cfb3ed9e18b46fe3cedb44025f2.1734594333.git.maxim.cournoyer@HIDDEN> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Sextidi 6 =?utf-8?Q?Niv=C3=B4se?= an 233 de la =?utf-8?Q?R=C3=A9volution=2C?= jour de la Lave X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Thu, 26 Dec 2024 11:55:52 +0100 Message-ID: <878qs2zpaf.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74962 Cc: Simon Josefsson <simon@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, 74962 <at> debbugs.gnu.org, Janneke Nieuwenhuizen <janneke@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis: > * etc/guix-install.sh (REQUIRE): Remove "which". Add "nologin". > (sys_create_build_user): Use 'type' instead of 'which'. > > Fixes: <https://issues.guix.gnu.org/74952> > Reported-by: Simon Josefsson <simon@HIDDEN> > Change-Id: I0675716bab3fc22d3289ee7af2cb0ab33a1cee71 LGTM.
guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.Received: (at 74962) by debbugs.gnu.org; 26 Dec 2024 10:55:47 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 26 05:55:47 2024 Received: from localhost ([127.0.0.1]:40226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tQlWt-0007Wd-BX for submit <at> debbugs.gnu.org; Thu, 26 Dec 2024 05:55:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:32960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tQlWr-0007WP-VT for 74962 <at> debbugs.gnu.org; Thu, 26 Dec 2024 05:55:46 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1tQlWm-00005z-NW; Thu, 26 Dec 2024 05:55:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=6MzBHsURx/+2LIRp9wzv2MLSxMLwxf1V3ZLB6d1mmaI=; b=SGV2mF1vqEYJsbc5+QrN oPEqjvx1eoFbw/VUjHlVe5qDvFb/mn0elQcwWt1WWnSMBezx43q5o5G0TyfnMit+Yxm9ojW+5jccp MwZrybLAzb/l52DBnU6CETpGk4UKIvkY4LEzjuxoA/loWlkMnbtgq/jLxgxfKr9I0NMWWS+RAybQ5 1SvebX8nmYFXIi/G3wTX3WVqesoslsniT9G5kHb/ZL7kKiSRDJ1dl6qCkK6MyKuuwKHEwo194kO/9 pdpVSZqLFo9HPd90wdnVR1O8wuYnxKAJ9HkYM0UXagO5pKodmP7CIS2k4HxPaWtbNNFXYBK0VXOH/ PHfJD3ig/vkP3w==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Subject: Re: [bug#74962] [PATCH 3/3] etc/guix-install.sh: Fix quoting and other issues. In-Reply-To: <6b04713cc24b58ab4bbf4ac4060e4d57f7c8e1b3.1734592672.git.maxim.cournoyer@HIDDEN> (Maxim Cournoyer's message of "Thu, 19 Dec 2024 16:17:52 +0900") References: <f7f432d7d1672c8934a4a3f50db4b858f1261f66.1734592672.git.maxim.cournoyer@HIDDEN> <6b04713cc24b58ab4bbf4ac4060e4d57f7c8e1b3.1734592672.git.maxim.cournoyer@HIDDEN> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Sextidi 6 =?utf-8?Q?Niv=C3=B4se?= an 233 de la =?utf-8?Q?R=C3=A9volution=2C?= jour de la Lave X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Thu, 26 Dec 2024 11:55:37 +0100 Message-ID: <87cyhezpau.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74962 Cc: Mathieu Othacehe <othacehe@HIDDEN>, Josselin Poiret <dev@HIDDEN>, 74962 <at> debbugs.gnu.org, Janneke Nieuwenhuizen <janneke@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis: > This change fixes most issues reported by the 'shellcheck' command. > > * etc/guix-install.sh (add_init_sys_require): Use -n instead of ! -z. > (sys_create_build_user): Quote variable expansion. > (sys_delete_build_user): Likewise. > (sys_create_shell_completion): Likewise. > (sys_delete_user_profiles): Likewise. > (main): Replace $@ with $* inside string. > > Change-Id: Ia88509b461b3844f2dd5abf9fb21a5b2bbb8a1e1 LGTM.
guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.Received: (at 74962) by debbugs.gnu.org; 26 Dec 2024 10:55:01 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 26 05:55:01 2024 Received: from localhost ([127.0.0.1]:40218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tQlW9-0007P4-0Z for submit <at> debbugs.gnu.org; Thu, 26 Dec 2024 05:55:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tQlW7-0007Oq-Ar for 74962 <at> debbugs.gnu.org; Thu, 26 Dec 2024 05:54:59 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1tQlW2-0008KA-4g; Thu, 26 Dec 2024 05:54:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=Xw67r0nPoyfj+gY2aH2aB6uJkVGKrEoYrlY9I8u+8AI=; b=Yksy4P8S0HNFGPb729Gz sTdPmfJMZ07yIQUqgQKByU5yjHXrbmR8srmJc9j+2kCN5TSu1ELXeRCjeZrnAZ8K0y7sQ4HtqRkf/ /auXKnhOhV5A/46wWLoYqs/jju6z52hSA0J6fPpTWyM3/zdSzDutSdDGtXq9RiwfuHaLofPcN/IBX fmZlCcvcKZHyLfJJi67Q2fpmsB/HJtxDDyC2yAfgDBtigY4D13ce2EoKtkLFw8ik1xviWHs+5kkRS Hfbvcuk/W4XFmMHj1crhOHH8Q97HhsD/OSb69IQkdBlwcL+aTngg5MKHNPn2BQqkizSfcVx+9QgPK POtZPXzVHk6fgw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Subject: Re: [bug#74962] [PATCH] etc/guix-install.sh: Explicit shebang to use /usr/bin/env. In-Reply-To: <0e7da0b076ebc6a90ae1c8c2c760b89ad6dd1d5e.1734591473.git.maxim.cournoyer@HIDDEN> (Maxim Cournoyer's message of "Thu, 19 Dec 2024 15:57:53 +0900") References: <0e7da0b076ebc6a90ae1c8c2c760b89ad6dd1d5e.1734591473.git.maxim.cournoyer@HIDDEN> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: Sextidi 6 =?utf-8?Q?Niv=C3=B4se?= an 233 de la =?utf-8?Q?R=C3=A9volution=2C?= jour de la Lave X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Thu, 26 Dec 2024 11:54:51 +0100 Message-ID: <87h66qzpc4.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74962 Cc: 74962 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Maxim Cournoyer <maxim.cournoyer@HIDDEN> skribis: > Having an explicit shebang tells something useful: we depend on Bash. Tools > such as shellcheck make use of it. The original technical reason for avoiding > /usr/bin/env is no more (Guix System lacking it). > > * etc/guix-install.sh: Adjust shebang. Remove conditional 'exec bash' further > block below. > > Change-Id: I3c92a9e58fe11610dfbf74dbbd4b1ac8852abcf0 LGTM!
guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 12:49:33 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 19 07:49:33 2024 Received: from localhost ([127.0.0.1]:37835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tOFy9-0006DP-6S for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 07:49:33 -0500 Received: from mail-pl1-f172.google.com ([209.85.214.172]:60544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1tOFy7-0006D8-1T for 74962 <at> debbugs.gnu.org; Thu, 19 Dec 2024 07:49:31 -0500 Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-216728b1836so6203055ad.0 for <74962 <at> debbugs.gnu.org>; Thu, 19 Dec 2024 04:49:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734612505; x=1735217305; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=4sKFJVdV3399NipvQjvbBLQDCkUbU0VrgZ+Yb7OiMSk=; b=Z4GW4H0iEkYR/eA/XS6TjPFD7SL8O7PTglF3vWCgFOjqEpukV19DZtaLtkrCEu+alX 2Vz7ppaqX48y8Fm5fRywTNpQ2/+x8C1H93snz0HPy+2RbhQzQiJ1Sv5XdNgSMXrOG591 Q+xJogXurnlSxGe/dxpgCPpytALueq13twPG67PJPkm7A+knIYgWsqPmbAe0kST3c5hh nKiwKwqDkON0l+GYidNHjPmdGY9hiolmYqhx/QiLzshC9nfWSSF27e6FKZS4kK1KG/pa GklOWr/NIvpHi2zFDcGSecsK5bsqrC4w4v+l6XWzYq1L3kzgWQ3ziMq2i6twehjIUjTz G1qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734612505; x=1735217305; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4sKFJVdV3399NipvQjvbBLQDCkUbU0VrgZ+Yb7OiMSk=; b=As2VOkCRfGCODYOjNwQjDr2IWt9xjkkQluN4LCMbp7flHFp7LZw0hjUJoKh4krLIGk AZMuefY3uwFzH+FpnWjxKKKh14z3RhCAevcT9UabN4yZCcgCGFUX2YsFuRlpyue4nerg pM9MpcjVOhk2Xg8k7dXsahFEV9bNYe3e3SqfZrS7emtQ41b56Yrdjs3RQOW1EBx2EWjE 1utwBp7V0z2/xCzC56aMsma9clnzISwyLXDCgkqzac/nBE78VCnvinD2oDGsEu3KK4P1 2WQL6Coo3vbmqQSgoBE/RqoUw+93a7XQjhZs11ODNP1QfPRq+7QeNThdqEZfC4zJ0QYY NXTg== X-Gm-Message-State: AOJu0YwI4heW5K+2R6YP/VegTmG3durjTcA2Dj/zia0uqwLJLSF0Jnsu zzMINwxmRit2nMMkL++BOzhhmGidIfPGM43M21w8swZMFMSkovkv X-Gm-Gg: ASbGncsDGiZs4dvKDoNunmPdnePucJfUhCa3GR9dmcUKpw/y10TZL0WtFHikcb042d0 NMzoOmpXjBGx8IgvQkxV/uVyWp/CcMTeF/yQ8JQSTWXseieKy1d5ZGPLINgoZxzeBXbr2ELmBFC B1UamVT+qKBDcvUQoSgftYadrzn4jhx/DNJcppSU0I9pAxx6i+AqalnQnL6sAvmv5GDDELEMMw+ Q9coaTTVkZKWyHM8N4rWD8gOYq4Q09mv1RtC9R+ynaS2exjwYssfg== X-Google-Smtp-Source: AGHT+IHjb4WmLkAu3uxiIjNvZwfddSk2cfJMsBP3kokM4k+fEB6kEGSMZ1iZej98aQA7/tKa6zwNxQ== X-Received: by 2002:a17:902:f54f:b0:216:760c:3879 with SMTP id d9443c01a7336-218d7273bcfmr92980365ad.46.1734612505227; Thu, 19 Dec 2024 04:48:25 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc972251sm11538235ad.96.2024.12.19.04.48.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2024 04:48:24 -0800 (PST) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: Janneke Nieuwenhuizen <janneke@HIDDEN> Subject: Re: [bug#74962] [PATCH 2/3] etc/guix-install.sh: Explicit shebang to use /usr/bin/env. In-Reply-To: <87bjx8rsqg.fsf@HIDDEN> (Janneke Nieuwenhuizen's message of "Thu, 19 Dec 2024 09:18:15 +0100") References: <f7f432d7d1672c8934a4a3f50db4b858f1261f66.1734592672.git.maxim.cournoyer@HIDDEN> <a2297d9739113db7e5166b9ee3d8fdb1db8e2cf4.1734592672.git.maxim.cournoyer@HIDDEN> <87bjx8rsqg.fsf@HIDDEN> Date: Thu, 19 Dec 2024 21:48:14 +0900 Message-ID: <87bjx7ltyp.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74962 Cc: Mathieu Othacehe <othacehe@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, 74962 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, Janneke Nieuwenhuizen <janneke@HIDDEN> writes: > Maxim Cournoyer writes: > > Hi Maxim, > >> * etc/guix-install.sh: Adjust shebang. Remove conditional 'exec bash' further >> block below. >> >> Change-Id: I3c92a9e58fe11610dfbf74dbbd4b1ac8852abcf0 >> --- >> etc/guix-install.sh | 15 ++++----------- >> 1 file changed, 4 insertions(+), 11 deletions(-) >> >> diff --git a/etc/guix-install.sh b/etc/guix-install.sh >> index f07b2741bb..481eb6f12a 100755 > [..] >> -if [ "x$BASH_VERSION" = "x" ] >> -then >> - exec bash "$0" "$@" >> -fi >> - > > +1 for the shebang but I think we want to keep this for people running: > sh install.sh, eg on Debian where sh is dash? Hm. Good point. I'll restore it in a v4, but I'll give it some time before I do, so as to avoid sending yet another series in a short time. -- Thanks, Maxim
guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 08:18:35 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 19 03:18:35 2024 Received: from localhost ([127.0.0.1]:37345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tOBjv-0001Nn-At for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 03:18:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@HIDDEN>) id 1tOBjt-0001NT-1F for 74962 <at> debbugs.gnu.org; Thu, 19 Dec 2024 03:18:33 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@HIDDEN>) id 1tOBjl-0000yJ-7M; Thu, 19 Dec 2024 03:18:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=jszofdnccnHcaZi35xBLk7UQt4q1io56uwsYX/MED0c=; b=Y7bKZkc7uO2ZTopXiuvl 7pBbQp8lvewmtPrsPzjFwnzFnp1y1uk5VW098M7BYx3gaiTdNAfS/G+TpzbZhxFIjvfx4eAxHwWK9 qYSSQpRXNKqgMBMkt1/y0sHHeOO9UB94rHszUCRuCEWWzFT4LTj6Zd1Dj0GsGc9ooMP6DImFHDSp+ M2sDSsU/DZQnz2ZwvkqXM6MMIE7mNrmYRS3jYnUCL533VOzXmu0CsvVByUOjcZ5loPodXWJBZR4Bt 4rloY4ePfjGDt/R+aCRPJRYF2kkjm6vTNNhhJGEDxRMphvsxI7m7tATewnn2GPdX8YxGliJ76ZA9v DdOtuJHpOmkCIA==; From: Janneke Nieuwenhuizen <janneke@HIDDEN> To: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Subject: Re: [bug#74962] [PATCH 2/3] etc/guix-install.sh: Explicit shebang to use /usr/bin/env. In-Reply-To: <a2297d9739113db7e5166b9ee3d8fdb1db8e2cf4.1734592672.git.maxim.cournoyer@HIDDEN> (Maxim Cournoyer's message of "Thu, 19 Dec 2024 16:17:51 +0900") Organization: AvatarAcademy.nl References: <f7f432d7d1672c8934a4a3f50db4b858f1261f66.1734592672.git.maxim.cournoyer@HIDDEN> <a2297d9739113db7e5166b9ee3d8fdb1db8e2cf4.1734592672.git.maxim.cournoyer@HIDDEN> X-Url: http://AvatarAcademy.nl Date: Thu, 19 Dec 2024 09:18:15 +0100 Message-ID: <87bjx8rsqg.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74962 Cc: Mathieu Othacehe <othacehe@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>, 74962 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Maxim Cournoyer writes: Hi Maxim, > * etc/guix-install.sh: Adjust shebang. Remove conditional 'exec bash' fu= rther > block below. > > Change-Id: I3c92a9e58fe11610dfbf74dbbd4b1ac8852abcf0 > --- > etc/guix-install.sh | 15 ++++----------- > 1 file changed, 4 insertions(+), 11 deletions(-) > > diff --git a/etc/guix-install.sh b/etc/guix-install.sh > index f07b2741bb..481eb6f12a 100755 [..] > -if [ "x$BASH_VERSION" =3D "x" ] > -then > - exec bash "$0" "$@" > -fi > - +1 for the shebang but I think we want to keep this for people running: sh install.sh, eg on Debian where sh is dash? Greetings, Janneke --=20 Janneke Nieuwenhuizen <janneke@HIDDEN> | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com
guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.
Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:47:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 19 02:47:33 2024
Received: from localhost ([127.0.0.1]:37290 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tOBFt-0008HJ-J5
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:47:33 -0500
Received: from mail-pg1-f171.google.com ([209.85.215.171]:44364)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tOBFo-0008GZ-VW
for 74962 <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:47:29 -0500
Received: by mail-pg1-f171.google.com with SMTP id
41be03b00d2f7-7f71f2b1370so242908a12.1
for <74962 <at> debbugs.gnu.org>; Wed, 18 Dec 2024 23:47:28 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1734594382; x=1735199182; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=a6OjoX+g5Z9nRYrvIvc2RZZ7lVV4npKKXZgXGI0bhKg=;
b=eR1GkjLnmw+R60UZgAnpSYXvYrUFhWS9n6ZBx5XZpJhVjUCLO/0wkR4ITTQ50gEQRB
/9tspx0a61gH1j/Hbzg9NUTt5mU1s8oG7CxbG+T1cvqUWHehMnAVWRb95XozSj+ofihY
HLz3mTpQPuRNco5FwYrLD+cS63ij0WmE7LM8UO5qtbC263/HIbXTXWwMOSNj6a/gM88S
1AQ7Qk1lMBaAmInFj3qYWES25eALSFSyRGQBVOnAmLQFBdZeUUdQFrregNfhsIEQ4MRm
RicGwaPOfcOgxPDIZLHQvb56K7QNV5Iy80TzwPF/qRkugO0FyHDXIOTtKtnOkeT9nLs7
3MDA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734594382; x=1735199182;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=a6OjoX+g5Z9nRYrvIvc2RZZ7lVV4npKKXZgXGI0bhKg=;
b=Hb2yYzH6s9ngF5aWZH84p3pecY33lusc2wq+Fd8pq6CzOGKePQfE/DWXAymKQdDY3A
keStrD/+rNzH75v8kK3pehR/hJqalVU8qapTAmXp2qQ66jKmhW4LP+GcwYunbpCB5rl1
5tTRDMnL51GQRS6GOMUvEhiXNg/eY+HmK/3rhXffj4vAJ5zBDOKVPQqCfX9y12lCavyi
/OVz2NEtQ3vAr8KmgL0iy5udMeBCFPN+X+Lh4284MlOxPlo2WpPP3tqSZ21kG3yWqC7C
ZrT4pp7MDMIzSCdu4CZ9f4AL2B32/E1ntjNGX4IIwHTrI1GqFttM+BS23cJZL8LOaTkP
prqg==
X-Gm-Message-State: AOJu0YwSMgZX2RmwrPvvVsGYC5nfchGSV3jckvoKe8E18YNrkRRj/j3O
3IiNi3eGbA/WI0a3iSpCcTyIFYy0l5rMWCy06+7/JZj/hBqxOUazf174kZ/5JEc=
X-Gm-Gg: ASbGnctlsXWcFPQkAVyxHZeomjRoc879vCJX20vcarYWg4mbF/g+GMwyHXXm98Vhp5x
6iwYJ1t3MFAFQtyRjSA4f00NGvjb34Lz0jzEttW4zdVD9PJwWhjjT1tKUPBcqXLc2905Z9f+s+y
h82rDCdP6fcPadziRskHXGp5ltAKnFJH9D35jZPfo4uRIHdfcQDSE6kY7KVlrwLcfms2jWzBOfp
CMctDsTmSk050Rk8sWlEpatZzfepu5lU1apVbCkiXfzD0ioRdek75I1t39dD5lHAU1ANo318/k=
X-Google-Smtp-Source: AGHT+IHQCdnPrsozPmsseSXW/5XNUM4fRAcfIhxafQ1b9JQrN/fALm3zFh1/t37K+nwdwtmHXRkByg==
X-Received: by 2002:a17:90a:c884:b0:2ee:d824:b559 with SMTP id
98e67ed59e1d1-2f2e938a64fmr7460575a91.28.1734594382441;
Wed, 18 Dec 2024 23:46:22 -0800 (PST)
Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89])
by smtp.gmail.com with ESMTPSA id
98e67ed59e1d1-2f2ed62e390sm2632821a91.21.2024.12.18.23.46.21
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 18 Dec 2024 23:46:21 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 74962 <at> debbugs.gnu.org
Subject: [PATCH v3 5/5] etc/guix-install.sh: Sort requirements.
Date: Thu, 19 Dec 2024 16:45:33 +0900
Message-ID: <027645209ae74112b8b70749ab23042a26ad99d6.1734594333.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN>
References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Janneke Nieuwenhuizen <janneke@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74962
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* etc/guix-install.sh (REQUIRE): Sort.
Change-Id: I59c57da31cd3846cf21810d5978d7d32516e0868
---
Changes in v3:
- New
etc/guix-install.sh | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index fb22287cf4..59d0d3820e 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -53,25 +53,25 @@ set -eo pipefail
[ "$UID" -eq 0 ] || { echo "This script must be run as root."; exit 1; }
REQUIRE=(
+ "chmod"
"dirname"
- "readlink"
- "wget"
+ "getent"
"gpg"
"grep"
+ "groupadd"
+ "groupdel"
+ "mktemp"
"nologin"
+ "readlink"
+ "rm"
"sed"
"sort"
- "getent"
- "mktemp"
- "rm"
- "chmod"
+ "tail"
+ "tr"
"uname"
- "groupadd"
- "groupdel"
"useradd"
"userdel"
- "tail"
- "tr"
+ "wget"
"xz"
)
--
2.46.0
janneke@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.
Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:47:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 19 02:47:29 2024
Received: from localhost ([127.0.0.1]:37288 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tOBFp-0008H0-5I
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:47:29 -0500
Received: from mail-pg1-f175.google.com ([209.85.215.175]:44096)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tOBFm-0008GU-Tg
for 74962 <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:47:27 -0500
Received: by mail-pg1-f175.google.com with SMTP id
41be03b00d2f7-7fd17f2312bso305058a12.0
for <74962 <at> debbugs.gnu.org>; Wed, 18 Dec 2024 23:47:26 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1734594381; x=1735199181; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=QfXLRdKWac+l1JVI0CcxwfLR7mQ3W5V+OryjERhOp70=;
b=fqURryhHD48rnWcZwIRuuliByu78NRdrXIVUDMYBbWGomWqcfiKqyO2VO+ZPBDbE6s
Wxvg2/vWI8VBut/ew44OgYRrYxVs2a29cxpJKvHcbpUZK0DDf69yF+dHkNv3wdALGNWa
AOGEuwQhqCjbwiPnQlKx/I29dQHFS7dAQULveg3ptXdksC5g0GRu4IGgAcYx9LoBmvoe
lRVlNOIGmEGGreDyb7aoL5NEV97HUUzUgohX7zgPFS/fxTXsRoPbfCWCPN5/yuyCW51A
r7sgqvH4C1ZfhIPKHR6VOEf+iQwSAEawD7Jf8iKRFLc3FDjGApTPE4utogLHR4gZ1bKt
KdKA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734594381; x=1735199181;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=QfXLRdKWac+l1JVI0CcxwfLR7mQ3W5V+OryjERhOp70=;
b=cqfg8baf7qP3rbPBAc6McURm/d0qcbEs+MWadexEks4wi88mbFNo0BI6VmN4MWCvoj
mayR0RCHe9oPW/JG4HtWv3/LipqnHQZvpXIqKv4RWG+ZireKyIkZYfvORMl3oSD0T+FH
nFZImVhjeX8KulGHjhMQ9e9u4A9viaVVR5BHvmNq5n6t72TQ4BNrWRmnafrZqVvXW5n/
H8lEdCmpBjh5tXFEmowqsJkT2S05k7j5jpb1/efSoXNGkoqnVQmkVcoNE1zCJk7hICSD
FHNAKVk54wdODbQKxKRfT8IP+15J/gaSINLGdnfxoNUkHQcma8I7LGLclbekspvZcYyV
r/jg==
X-Gm-Message-State: AOJu0YxcaniTMNUrSJdWVhC/4RQLJamGrmxUiIeKQWhT8EuWecXrF1LA
ehQIV0e+bfYFH6kGsQzqtzASEFQBSsV6qDrOOktCtLCkFL5FvbB7inSE1hMU9hE=
X-Gm-Gg: ASbGncuVfDhxlfSkYvpsCYBtedRUuwwTMYHzutX28rfWAeCv3ufAcX6hU0Xu0bQM13l
Ly2HbM50IwdYxho8JJo2G27nAR3qAwEJ7H6GBp+laq1kdv7shnpBhv8DGzQJ933UeoNVlw07xZe
jpCI6W3SmlW0v7Cv50sRj15A1STuoqMUoF2SelzwctsTQ+OEHGSBz5mdCePYKot8rCa/dv1MBbv
zw+mH04aCsaLxAva2RRfgbWf2Di5y5dpWtN5uj0ivs/wwKYS+GLv/Vj09UzFuUgom39qe6wek0=
X-Google-Smtp-Source: AGHT+IEi8kkno3BmGpVLxKtgaXOqqPvrAlEoyupybimJMODH97HA5Zkfv9i6jUFsGjnUrc0sQ9iYIA==
X-Received: by 2002:a17:90b:524f:b0:2f4:49d8:e6f6 with SMTP id
98e67ed59e1d1-2f449d8e82emr1288257a91.3.1734594380685;
Wed, 18 Dec 2024 23:46:20 -0800 (PST)
Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89])
by smtp.gmail.com with ESMTPSA id
98e67ed59e1d1-2f2ed62e390sm2632821a91.21.2024.12.18.23.46.19
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 18 Dec 2024 23:46:20 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 74962 <at> debbugs.gnu.org
Subject: [PATCH v3 4/5] etc/guix-install.sh: Remove 'which' commands from
requirements.
Date: Thu, 19 Dec 2024 16:45:32 +0900
Message-ID: <6d1f4ffaa70f4cfb3ed9e18b46fe3cedb44025f2.1734594333.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN>
References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Janneke Nieuwenhuizen <janneke@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74962
Cc: Simon Josefsson <simon@HIDDEN>,
Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* etc/guix-install.sh (REQUIRE): Remove "which". Add "nologin".
(sys_create_build_user): Use 'type' instead of 'which'.
Fixes: <https://issues.guix.gnu.org/74952>
Reported-by: Simon Josefsson <simon@HIDDEN>
Change-Id: I0675716bab3fc22d3289ee7af2cb0ab33a1cee71
---
Changes in v3:
- New.
etc/guix-install.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 8d3d9d224b..fb22287cf4 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -58,7 +58,7 @@ REQUIRE=(
"wget"
"gpg"
"grep"
- "which"
+ "nologin"
"sed"
"sort"
"getent"
@@ -429,12 +429,12 @@ sys_create_build_user()
if id "guixbuilder${i}" &>/dev/null; then
_msg "${INF}user is already in the system, reset"
usermod -g guixbuild -G "guixbuild${KVMGROUP}" \
- -d /var/empty -s "$(which nologin)" \
+ -d /var/empty -s "$(type -P nologin)" \
-c "Guix build user $i" \
"guixbuilder${i}";
else
useradd -g guixbuild -G "guixbuild${KVMGROUP}" \
- -d /var/empty -s "$(which nologin)" \
+ -d /var/empty -s "$(type -P nologin)" \
-c "Guix build user $i" --system \
"guixbuilder${i}";
_msg "${PAS}user added <guixbuilder${i}>"
--
2.46.0
janneke@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.
Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:47:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 19 02:47:25 2024
Received: from localhost ([127.0.0.1]:37284 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tOBFk-0008Gd-OE
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:47:25 -0500
Received: from mail-pj1-f44.google.com ([209.85.216.44]:56596)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tOBFh-0008G1-0w
for 74962 <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:47:21 -0500
Received: by mail-pj1-f44.google.com with SMTP id
98e67ed59e1d1-2ee786b3277so309356a91.1
for <74962 <at> debbugs.gnu.org>; Wed, 18 Dec 2024 23:47:20 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1734594374; x=1735199174; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=Z0Fwox8yUt+6WwvAGkybgM3h+UlFmFd1AmkKcCHw7fk=;
b=gw2///5ZLsLVe8mR1ffvWXRV314dLOVNxBxuhK3+1d1l72N14RE5lUoI4y2Txr+1gl
WPOGT0ecxlhbvETzdQygzStpiX8Fgf5drACt2K6qrxgJEfTmXVPAGRDlhNRm2XGWxw37
X223ZJk7/FoOyRYHVcSckIc7FvImLpvhoKtGlhrK5ValcL2SSW9D/z77YmyTsZsnu4Xe
svbTWbGdKrLSpBQLWhcamrhz7jZLR3Kmh5iE8aB3LdpKnEkujR4CqSmL7A5MQqKeL+v9
0G3B5wJW7LW4GFXH5pOxZEhNoXqfe9PgggMJe27VD2HTeesZHdIvrMP54UgtYGMiWtIH
7J6Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734594374; x=1735199174;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=Z0Fwox8yUt+6WwvAGkybgM3h+UlFmFd1AmkKcCHw7fk=;
b=KjRdjd4uXuC2YcVDxLgKmW3vE4TGL42X3mKIePiBxZNL1k0jr1ZBRW/T64/C/1ZGIa
xi48CzoSVv3jjvIGAByt/S5FYFcxe+UHRJl/sOdTuJUW/b8b1F4dlg6rRxPVof+SCFGb
Ivvi4lJK2GZZTfkvDJsCWfJBDN+E3zsDBZUrdocRJWonsviGSL/nEsPw71xGLNFMOde3
Mu1T6/x/T9k+M0PZy4lYZpwH+AYY/FqxISlOB6RHs7J14UrdZVPrAZy29iMWLPunOamR
LjmUihmQF3ID9lmVNFfkDB3fxSoo3VL9RzyE4j2oA3i2uEBFm+la/gjfsas8aGSwebiD
Vt1Q==
X-Gm-Message-State: AOJu0Yx6bqD/ecBn18MaGVrq55qunif0tzaUFwMV462TcQSL/xAaOn7v
1E2tItZtuu6W/aCj/GowZFka/8PG3Cn73o3UWsCurl6he/IZhXToCxQE4D5NT9Y=
X-Gm-Gg: ASbGnct2BuXJDrHuan5sstWlZ0k4j29tXRh03jJjHLlPcuNfeT0gjMOWhdhJW4hDnR7
XaopH2HjgpoiqkjTeChvxUZYdlbv+7dBqZ2Fn1sNBLJpPyjBQ5Az7PyFxkk403GIn7xE9j6kv+m
/S6bG8vG2PnKeb0T3r0q3uMucKDaWUE0rc0HhNKkWKO91koTOokeWaApTVfPyp64JNMoEKGtUAx
9Q+73H/Dvof2Z/D43fja7TfWr9PfSzhcTJafrfsdv3ZcLueLH9vHcKeFa0KICm/E3WMoIGk0y0=
X-Google-Smtp-Source: AGHT+IF4Jo27q4ETbludjWBpajEIQe5Lwcy3rhUrDotwPLxM3dcXJ/vBW/WhJCkWEV8MIV0T5MfFcg==
X-Received: by 2002:a17:90b:4f:b0:2ee:d9f5:cfb4 with SMTP id
98e67ed59e1d1-2f2e9386601mr7727908a91.36.1734594374568;
Wed, 18 Dec 2024 23:46:14 -0800 (PST)
Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89])
by smtp.gmail.com with ESMTPSA id
98e67ed59e1d1-2f2ed62e390sm2632821a91.21.2024.12.18.23.46.13
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 18 Dec 2024 23:46:14 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 74962 <at> debbugs.gnu.org
Subject: [PATCH v3 1/5] etc/teams.scm: Add etc/guix-install.sh to installer
team scope.
Date: Thu, 19 Dec 2024 16:45:29 +0900
Message-ID: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74962
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* etc/teams.scm (installer) <#:scope>: Add "etc/guix-install.sh".
Change-Id: I351476c3150c25c8d403e9a4ff0a05c98b9d1821
---
(no changes since v2)
Changes in v2:
- New.
etc/teams.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/etc/teams.scm b/etc/teams.scm
index 6b492f1d4b..fb6a30ed2f 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -10,7 +10,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022-2024 Ricardo Wurmus <rekado@HIDDEN>
;;; Copyright © 2022 Mathieu Othacehe <othacehe@HIDDEN>
-;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
+;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
;;; Copyright © 2022 Simon Tournier <zimon.toutoune@HIDDEN>
;;;
;;; This file is part of GNU Guix.
@@ -523,7 +523,8 @@ (define-team translations
(define-team installer
(team 'installer
#:name "Installer script and system installer"
- #:scope (list (make-regexp* "^gnu/installer(\\.scm$|/)"))))
+ #:scope (list (make-regexp* "^gnu/installer(\\.scm$|/)")
+ "etc/guix-install.sh")))
(define-team home
(team 'home
base-commit: 17c0aa6192f6a90c227e92720f2d63240996d0d4
--
2.46.0
guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.
Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:47:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 19 02:47:24 2024
Received: from localhost ([127.0.0.1]:37282 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tOBFk-0008Gb-8H
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:47:24 -0500
Received: from mail-pj1-f44.google.com ([209.85.216.44]:55530)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tOBFg-0008G9-6s
for 74962 <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:47:20 -0500
Received: by mail-pj1-f44.google.com with SMTP id
98e67ed59e1d1-2ee397a82f6so449741a91.2
for <74962 <at> debbugs.gnu.org>; Wed, 18 Dec 2024 23:47:20 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1734594379; x=1735199179; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=kyai9a0xw7doOzBfxMKg5s+5C0JGtZljzpCdMbXiOvo=;
b=cQ2Ss5jYAnkIvmjJYD7VK6zhrAZSFm7kGimaSbPJSQT1cJB1joV3nJHEmOzMfYQrvF
C7xF77k1zvueV63Ssy+XwPjnAJxqYzNs03QLiQLCOpgW2JeKf8gVFw3AvA/c68KD8Gy8
41/STsTMwg5COWWFy9yojrm3WtDPfSkqiKSWXdnCIA9szkT94sWct8P49qSCYHA8OXuW
vnEWL58rkfFxvDMW5Oxecb9jtFHjMUG4Xmt9xBLscmfFp+5UV/ABQH+SXH1IVhkQq0Jp
5ygtTckkzklSmUwXnDtJDo5OW4GcoLucuGuin0XbLu4TGs6nenGAiJmL9AbMyb0J4UlT
jhVw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734594379; x=1735199179;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=kyai9a0xw7doOzBfxMKg5s+5C0JGtZljzpCdMbXiOvo=;
b=C1xRh0pH6mXFNjdcmxyVaBDc/UhlV9c8i9mDISJcEZd0YwePYELNO25gMN33t7/y+3
KGC4c/jRWWlxHsVqewuVJ8HyB57ALi1pQTMQjCvRidb6GX+9ez6eTpLh5JaWDmcTlMlO
9j2/Qy0H2W4nlSZqFVF7IQIXu6bIF+jrBsdFU1D2EOXwvJcESzcXS9jps4iv5Il0bKWG
VPoOztFtLPV4Wcx0wC032omo+W2Nf0s8t/j8OnZ/mGOYP2HoXsb2B/Je8oTxphw2jKgx
ohosmFlTfDo2rQD4pNNQXYtiosA97+SB/UkH1IeSLsC7q9qGl68Jz2MaG2/ggr+ezEen
OfJg==
X-Gm-Message-State: AOJu0YwOjcxNz7gI5e0K6Mfr+/QYNxPNtMJPppsr8Iku35YUXE8fRGMU
jlDpXRg2SKPg0IaA+a8XXS+0VT1SLGas1Z12iAKFTVn6pOzKMdQbHKISlXctbo8=
X-Gm-Gg: ASbGncs5IW5OLyohN8jLEBXvAje5dmysLpUxuGahz0BVYhLHM9FNpT2p//QJlDFXJcr
T4dHiND63Xl7kx+VYxVKy1UGhZpbxib1/pVab9YJhAjoo1kF1N5ycykB/pIFJgl/eZf/Z+tAmEJ
ZEi0M6cdHvLCD1MgBxy9+SgZf/5iM5UvzI6Pvtn76n9jGh41BU2X2paJvElDsrZzOlmZQYEMQ73
f6VpYqTyXDK3lxjt1vk1i12rNMzY35NOAYrm7jce/jTxNR0lqvoG6zg40T8elZ2oapk5JKq06M=
X-Google-Smtp-Source: AGHT+IHaqv47HcSvymHPfH207MP2GkrZff3SOTqz626jSVK3QvdBfl1Xuosm2E5uLrtHUTfnbcEhSg==
X-Received: by 2002:a17:90a:f945:b0:2ea:696d:732f with SMTP id
98e67ed59e1d1-2f443d452a9mr3492459a91.29.1734594378657;
Wed, 18 Dec 2024 23:46:18 -0800 (PST)
Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89])
by smtp.gmail.com with ESMTPSA id
98e67ed59e1d1-2f2ed62e390sm2632821a91.21.2024.12.18.23.46.17
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 18 Dec 2024 23:46:18 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 74962 <at> debbugs.gnu.org
Subject: [PATCH v3 3/5] etc/guix-install.sh: Fix quoting and other issues.
Date: Thu, 19 Dec 2024 16:45:31 +0900
Message-ID: <093604124092d3b024127068cbbeff3f9aa62d76.1734594333.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN>
References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Janneke Nieuwenhuizen <janneke@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74962
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This change fixes most issues reported by the 'shellcheck' command.
* etc/guix-install.sh (add_init_sys_require): Use -n instead of ! -z.
(sys_create_build_user): Quote variable expansion.
(sys_delete_build_user): Likewise.
(sys_create_shell_completion): Likewise.
(sys_delete_user_profiles): Likewise.
(sys_delete_guix_daemon): Explicitly access first array item.
(sys_create_store): Update shellcheck code to ignore.
(SYSV_INIT_REQUIRE): Ignore unused warning.
(sys_customize_bashrc): Ignore warnings due to using variables inside a
literal.
(main): Replace $@ with $* inside string.
Change-Id: Ia88509b461b3844f2dd5abf9fb21a5b2bbb8a1e1
---
Changes in v3:
- Add comments to avoid remaining shellcheck warnings.
etc/guix-install.sh | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 481eb6f12a..8d3d9d224b 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -77,6 +77,7 @@ REQUIRE=(
# Add variables using form FOO_INIT_REQUIRE when init system FOO dependencies
# should be checked.
+# shellcheck disable=SC2034 # the variable name is computed
SYSV_INIT_REQUIRE=(
"daemonize"
)
@@ -151,7 +152,7 @@ chk_require()
add_init_sys_require()
{ # Add the elements of FOO_INIT_SYS to REQUIRE
local init_require="${INIT_SYS}_REQUIRE[@]"
- if [[ ! -z "$init_require" ]]; then
+ if [[ -n "$init_require" ]]; then
# Have to add piecemeal because ${!foo[@]} performs direct array key
# expansion, not indirect plain array expansion.
for r in "${!init_require}"; do
@@ -390,7 +391,7 @@ sys_create_store()
~root/.config/guix/current
GUIX_PROFILE=~root/.config/guix/current
- # shellcheck disable=SC1090
+ # shellcheck disable=SC1091
source "${GUIX_PROFILE}/etc/profile"
_msg "${PAS}activated root profile at ${GUIX_PROFILE}"
}
@@ -427,12 +428,12 @@ sys_create_build_user()
for i in $(seq -w 1 10); do
if id "guixbuilder${i}" &>/dev/null; then
_msg "${INF}user is already in the system, reset"
- usermod -g guixbuild -G guixbuild${KVMGROUP} \
+ usermod -g guixbuild -G "guixbuild${KVMGROUP}" \
-d /var/empty -s "$(which nologin)" \
-c "Guix build user $i" \
"guixbuilder${i}";
else
- useradd -g guixbuild -G guixbuild${KVMGROUP} \
+ useradd -g guixbuild -G "guixbuild${KVMGROUP}" \
-d /var/empty -s "$(which nologin)" \
-c "Guix build user $i" --system \
"guixbuilder${i}";
@@ -445,7 +446,7 @@ sys_delete_build_user()
{
for i in $(seq -w 1 10); do
if id -u "guixbuilder${i}" &>/dev/null; then
- userdel -f guixbuilder${i}
+ userdel -f "guixbuilder${i}"
fi
done
@@ -551,7 +552,7 @@ sys_delete_guix_daemon()
local local_bin
local var_guix
- _debug "--- [ $FUNCNAME ] ---"
+ _debug "--- [ ${FUNCNAME[0]} ] ---"
info_path="/usr/local/share/info"
local_bin="/usr/local/bin"
@@ -681,7 +682,7 @@ sys_create_shell_completion()
{ # Just in case
for dir_shell in $bash_completion $zsh_completion $fish_completion; do
- [ -d "$dir_shell" ] || mkdir -p $dir_shell
+ [ -d "$dir_shell" ] || mkdir -p "$dir_shell"
done;
ln -sf ${var_guix}/etc/bash_completion.d/* "$bash_completion";
@@ -696,8 +697,10 @@ sys_customize_bashrc()
for bashrc in /home/*/.bashrc /root/.bashrc; do
test -f "$bashrc" || continue
+ # shellcheck disable=SC2016 # checking for literal $GUIX_ENVIRONMENT
grep -Fq '$GUIX_ENVIRONMENT' "$bashrc" && continue
cp "${bashrc}" "${bashrc}.bak"
+ # shellcheck disable=SC2016,SC2028 # that's also a string literal
echo '
# Automatically added by the Guix install script.
if [ -n "$GUIX_ENVIRONMENT" ]; then
@@ -747,10 +750,10 @@ sys_delete_user_profiles()
rm -rf ~root/.cache/guix
_msg "${INF}removing .guix-profile, .cache/guix and .config/guix of all /home users"
- for user in `ls -1 /home`; do
- rm -f /home/$user/.guix-profile
- rm -rf /home/$user/.cache/guix
- rm -rf /home/$user/.config/guix
+ for user in /home/*; do
+ rm -f "/home/$user/.guix-profile"
+ rm -rf "/home/$user/.cache/guix"
+ rm -rf "/home/$user/.config/guix"
done
}
@@ -898,7 +901,7 @@ main()
if [ '--uninstall' = "${uninstall_flag}" ]; then
main_uninstall
else
- echo "unsupported parameters: $@"
+ echo "unsupported parameters: $*"
exit 1
fi
fi
--
2.46.0
janneke@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.
Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:47:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 19 02:47:21 2024
Received: from localhost ([127.0.0.1]:37279 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tOBFg-0008GE-EG
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:47:21 -0500
Received: from mail-pj1-f51.google.com ([209.85.216.51]:42168)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tOBFe-0008G5-Hc
for 74962 <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:47:19 -0500
Received: by mail-pj1-f51.google.com with SMTP id
98e67ed59e1d1-2ef714374c0so391210a91.0
for <74962 <at> debbugs.gnu.org>; Wed, 18 Dec 2024 23:47:18 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1734594377; x=1735199177; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=JKaXg5CVvmHbZZWAGgFicsTCHyNbvF8R+4IuItKkJHg=;
b=VK3fFbBHeheXMElUC2ZLINEVkTeTOYUjxvHpAk+JWOyOmtQxTpgJzidtsOuCnp1nq3
+Sty73TjbSMcqn/kMWLdCwgdXQKtn9jV6dqCNfOS+ZI9lbZ2+384mz1GlM/If+QYhNHq
XQbIVjEeirJxV2RFX6krWvIVvt+dnPiLcp3vZ8erph/mtMLca3+Kye6t7fmiMARShutc
V/yMXSTMkq4kNhVZhY52F0Wll6zZKIbmZ5GMkeknq1pqvCIcFtui5B5NxHxVZui9XY6z
kUW71hdPvh+xtlHTLGehbLgObc8UyeNez3p4SzgUY8UzP6tNDxs9XZ9sON1aILFxx3gw
EZ2w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734594377; x=1735199177;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=JKaXg5CVvmHbZZWAGgFicsTCHyNbvF8R+4IuItKkJHg=;
b=AcChFcpDHtEbwU5YSaNmMFdxLHy+w6NhpWh52e5N+XasZul+OkMaoZnf7kBVkZHxFE
5T3wl76IXCaFH7JVyF3ZVhvHKPk9ePpBLoe+9cp4dxlJpggmeaJSCk6mR/fdqL5SNwTK
vf6Dejph8nNWYkw7MPA82hLjDY8GI+oB5uX3d6h/BdMGupNsCtfB9FN9FB+Qg2Eu+pI/
eMTor13TSdw0B2tmCmW2u/ffLDvxmYfPNWSd+hsBCeDv15VAlT3sTCZ0YeNZ0aNK1kqi
EDPWeTkeu7jD2NOVsO4suDi6ileaYiU75RWGkvhYRZWxwGogSPRdah8+QH6z28D22RMT
S95Q==
X-Gm-Message-State: AOJu0YwC3t1ylWOimYNf2qlxlcSnSGyiyaMIb9aspHCCu3zPmOh8myv9
ZFKjfx/rdbmF1p/hE/pWYX04eHsnz7At2fuNRPumKN5uGLtIOebhcUMz99z0gAw=
X-Gm-Gg: ASbGncu8DOAhlEQd/zIvE1njl4tGkHtkSZv+kEMM/dmNnz9n2L5rJldCrk/qALRV95R
IjOmm1+7DLHVlKdwWpzYx8PpryzrwimRvghznu0IXQsk9Afda6ZmszQllZ/aXNGMg/0p/dpia3K
4LiGuvAVzl3NA1hPvbWoQ43cu7EtDh+IDzj/fk+l6IPvMz+ViTLD7KaPQvV3u+2EqDCutf8zGpd
Sfoo249RnPMeOQvfEr0I+ben4E+txWFy6RhtAW4PeuW/q0YTij6ddiPgdLsMtolMJONn/Y4k4g=
X-Google-Smtp-Source: AGHT+IHxB9qiJQk5+0+RJhha0N1R7Fk3ShFHEHoHZYXwpGsjRRtXvEDm7yUDWxSlxuuBZIMkZpE+hw==
X-Received: by 2002:a17:90b:2b83:b0:2ef:9dbc:38d1 with SMTP id
98e67ed59e1d1-2f4435ad5e6mr3331952a91.5.1734594376445;
Wed, 18 Dec 2024 23:46:16 -0800 (PST)
Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89])
by smtp.gmail.com with ESMTPSA id
98e67ed59e1d1-2f2ed62e390sm2632821a91.21.2024.12.18.23.46.15
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 18 Dec 2024 23:46:15 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 74962 <at> debbugs.gnu.org
Subject: [PATCH v3 2/5] etc/guix-install.sh: Explicit shebang to use
/usr/bin/env.
Date: Thu, 19 Dec 2024 16:45:30 +0900
Message-ID: <e7d212e0dc73512f576e47f1a97ebe74a003d251.1734594333.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN>
References: <3d0ccfc5f28f48b0a4e513e4ebfd3018c85b4407.1734594333.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Janneke Nieuwenhuizen <janneke@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74962
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Having an explicit shebang tells something useful: we depend on Bash. Tools
such as shellcheck make use of it. The original technical reason for avoiding
/usr/bin/env is no more (Guix System lacking it).
* etc/guix-install.sh: Adjust shebang. Remove conditional 'exec bash' further
block below.
Change-Id: I3c92a9e58fe11610dfbf74dbbd4b1ac8852abcf0
---
(no changes since v1)
etc/guix-install.sh | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index f07b2741bb..481eb6f12a 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# GNU Guix --- Functional package management for GNU
# Copyright © 2017 sharlatan <sharlatanus@HIDDEN>
# Copyright © 2018 Ricardo Wurmus <rekado@HIDDEN>
@@ -9,7 +9,7 @@
# Copyright © 2020 Daniel Brooks <db48x@HIDDEN>
# Copyright © 2021 Jakub Kądziołka <kuba@HIDDEN>
# Copyright © 2021 Chris Marusich <cmmarusich@HIDDEN>
-# Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
+# Copyright © 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
# Copyright © 2022 Prafulla Giri <prafulla.giri@HIDDEN>
# Copyright © 2023 Andrew Tropin <andrew@HIDDEN>
# Copyright © 2020 David A. Redick <david.a.redick@HIDDEN>
@@ -31,10 +31,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
-
-# We require Bash but for portability we'd rather not use /bin/bash or
-# /usr/bin/env in the shebang, hence this hack.
-
+#
+#
# Environment variables
#
# GUIX_BINARY_FILE_NAME
@@ -50,11 +48,6 @@
# installation required the user to extract Guix packs under /gnu to
# satisfy its dependencies.
-if [ "x$BASH_VERSION" = "x" ]
-then
- exec bash "$0" "$@"
-fi
-
set -eo pipefail
[ "$UID" -eq 0 ] || { echo "This script must be run as root."; exit 1; }
--
2.46.0
janneke@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.
Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:19:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 19 02:19:50 2024
Received: from localhost ([127.0.0.1]:37223 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tOAp3-0006sG-TE
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:19:50 -0500
Received: from mail-pg1-f175.google.com ([209.85.215.175]:56619)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tOAoy-0006rj-A6
for 74962 <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:19:44 -0500
Received: by mail-pg1-f175.google.com with SMTP id
41be03b00d2f7-801986033f9so234609a12.1
for <74962 <at> debbugs.gnu.org>; Wed, 18 Dec 2024 23:19:44 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1734592718; x=1735197518; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=EVW8jbb9u5L41BdaLi+PKnhfahNg1LxL8P7iP7Kkj84=;
b=Qu72SP486PJO67woubxRJx5V4ox83T0B6+QF6aTKqSwyKMLydT7IJJhPgpBpjJxQUd
wKE9DWiPZkzKw/9Qywn5C+z6q1W4/f9VP1p9VjTv/nO2c2TuGj9bAhe7/hkY78J7WTtb
UCq8mRTedZzwXMbI3+HQRtdaLnaheTbJEOpnXqh2O61NCSG/LCE59L4wsId7g0zAVe+T
DidyfQwKzz/PW3tAWXIz0xesXjifGDmkoD68R6KUZ1flA6av7Yn80B/Pg3tBdNV51wLH
OHos8WWoVMJ9ZTBjk/7SZOousbtfN7X4xWfezqPiwRynBM2Hda+5gVEpIIw6uMeEqHV3
lQig==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734592718; x=1735197518;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=EVW8jbb9u5L41BdaLi+PKnhfahNg1LxL8P7iP7Kkj84=;
b=ra7+j2rtL0itOqyMZ/nRW31PX9Th6141z+TbxJFa6YzgSyH0rEvuPO11ZbtkDJEuiW
WvfFRJoUaty5m6DMF1E4IRF0ZPxlONwJpmofHws+eZS1UYZib1fQQc1S0drJEEJhrjsF
Bs1m6ZBdejn0CN+IAcLItlpxAE+qiLugmFyjBs2hot4f5SOUV9QI+3ON27wrzEadcGLa
tpNTPFvKwPl1r4Xboe0n5KjmZFYjNvOUYRb9A33nt1JMDU2ehDIIBDRsbluuI2RuFWKI
8viQ4J33gRtWIRsVC+yJvGx6sWOKqWT9BNWqbS9ertFksR/gd7PdyGq8y1zLH1W7e0pA
gTrQ==
X-Gm-Message-State: AOJu0Yy1LYQK8Mw6fYMBMPD+i+Htvk5yUwEqcJm0r9GEx//enfyIVFtV
Bzf58cvtU/N9h7EqwNT6MaygTyVxGEKwd94vzDTQTY4q5wyOWeto3JHErHpMxKw=
X-Gm-Gg: ASbGncv5NMyL3IINga9be+j7wVvKBwSxWyUXQqcu/ZCOuYYnnX8Yqobj09sYczvAAK6
/UXebCNfRYheZnMBnu7v9UnU2khYTxhEPHkeoLzjUNu9KnqY5dkXBXwM60VFyf/VuwUVxMK28V1
UckBySnWeCU2qwOE8bBmUyhyBpcz7jRlwLFbk7KmcrlN8CcSdLk60JwY/dQyrIL5e0NzNGzXC9r
wgif4lm3wJ3O4ST1phGZ9JJ0xaVelM8Vw2XutsfT73f8zvLV9Zv7B23DDalaKUHR6bl9R5xuCk=
X-Google-Smtp-Source: AGHT+IFkVLbnZzePwr5CuTueTqr+1vP7tjpHYyGWK/XOVrsEQMgxOd7ZAwgSgDXz1mgegwUc2D1Now==
X-Received: by 2002:a17:90b:5484:b0:2ea:853b:2761 with SMTP id
98e67ed59e1d1-2f2e93865f6mr8941972a91.37.1734592718135;
Wed, 18 Dec 2024 23:18:38 -0800 (PST)
Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89])
by smtp.gmail.com with ESMTPSA id
98e67ed59e1d1-2f2ed8304absm2833241a91.24.2024.12.18.23.18.36
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 18 Dec 2024 23:18:37 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 74962 <at> debbugs.gnu.org
Subject: [PATCH 3/3] etc/guix-install.sh: Fix quoting and other issues.
Date: Thu, 19 Dec 2024 16:17:52 +0900
Message-ID: <6b04713cc24b58ab4bbf4ac4060e4d57f7c8e1b3.1734592672.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <f7f432d7d1672c8934a4a3f50db4b858f1261f66.1734592672.git.maxim.cournoyer@HIDDEN>
References: <f7f432d7d1672c8934a4a3f50db4b858f1261f66.1734592672.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Janneke Nieuwenhuizen <janneke@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74962
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This change fixes most issues reported by the 'shellcheck' command.
* etc/guix-install.sh (add_init_sys_require): Use -n instead of ! -z.
(sys_create_build_user): Quote variable expansion.
(sys_delete_build_user): Likewise.
(sys_create_shell_completion): Likewise.
(sys_delete_user_profiles): Likewise.
(main): Replace $@ with $* inside string.
Change-Id: Ia88509b461b3844f2dd5abf9fb21a5b2bbb8a1e1
---
etc/guix-install.sh | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 481eb6f12a..2ab443d97b 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -151,7 +151,7 @@ chk_require()
add_init_sys_require()
{ # Add the elements of FOO_INIT_SYS to REQUIRE
local init_require="${INIT_SYS}_REQUIRE[@]"
- if [[ ! -z "$init_require" ]]; then
+ if [[ -n "$init_require" ]]; then
# Have to add piecemeal because ${!foo[@]} performs direct array key
# expansion, not indirect plain array expansion.
for r in "${!init_require}"; do
@@ -427,12 +427,12 @@ sys_create_build_user()
for i in $(seq -w 1 10); do
if id "guixbuilder${i}" &>/dev/null; then
_msg "${INF}user is already in the system, reset"
- usermod -g guixbuild -G guixbuild${KVMGROUP} \
+ usermod -g guixbuild -G "guixbuild${KVMGROUP}" \
-d /var/empty -s "$(which nologin)" \
-c "Guix build user $i" \
"guixbuilder${i}";
else
- useradd -g guixbuild -G guixbuild${KVMGROUP} \
+ useradd -g guixbuild -G "guixbuild${KVMGROUP}" \
-d /var/empty -s "$(which nologin)" \
-c "Guix build user $i" --system \
"guixbuilder${i}";
@@ -445,7 +445,7 @@ sys_delete_build_user()
{
for i in $(seq -w 1 10); do
if id -u "guixbuilder${i}" &>/dev/null; then
- userdel -f guixbuilder${i}
+ userdel -f "guixbuilder${i}"
fi
done
@@ -681,7 +681,7 @@ sys_create_shell_completion()
{ # Just in case
for dir_shell in $bash_completion $zsh_completion $fish_completion; do
- [ -d "$dir_shell" ] || mkdir -p $dir_shell
+ [ -d "$dir_shell" ] || mkdir -p "$dir_shell"
done;
ln -sf ${var_guix}/etc/bash_completion.d/* "$bash_completion";
@@ -747,10 +747,10 @@ sys_delete_user_profiles()
rm -rf ~root/.cache/guix
_msg "${INF}removing .guix-profile, .cache/guix and .config/guix of all /home users"
- for user in `ls -1 /home`; do
- rm -f /home/$user/.guix-profile
- rm -rf /home/$user/.cache/guix
- rm -rf /home/$user/.config/guix
+ for user in /home/*; do
+ rm -f "/home/$user/.guix-profile"
+ rm -rf "/home/$user/.cache/guix"
+ rm -rf "/home/$user/.config/guix"
done
}
@@ -898,7 +898,7 @@ main()
if [ '--uninstall' = "${uninstall_flag}" ]; then
main_uninstall
else
- echo "unsupported parameters: $@"
+ echo "unsupported parameters: $*"
exit 1
fi
fi
--
2.46.0
janneke@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.
Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:19:44 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 19 02:19:44 2024
Received: from localhost ([127.0.0.1]:37220 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tOAoy-0006rw-BI
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:19:44 -0500
Received: from mail-pj1-f42.google.com ([209.85.216.42]:52271)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tOAow-0006rc-Fe
for 74962 <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:19:43 -0500
Received: by mail-pj1-f42.google.com with SMTP id
98e67ed59e1d1-2efded08c79so333040a91.0
for <74962 <at> debbugs.gnu.org>; Wed, 18 Dec 2024 23:19:42 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1734592716; x=1735197516; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=g27M3iObPvhbrCTv91lyWvzbV6VPtZa19dTQmpnInAs=;
b=TukM3iDu77iUTIZMyyXpnmH7j/uAItgKW24nouq37sStnTbJ5E3UVd1guMxpItREN1
2t1rgj8ljuxUiZ/OgOzOSO6xDbUWutyCNMfD2LsdBfCU8ZKPvOBcvi44cNwaibTTTOcq
Chyf1E12P/FyEFV/emnngy7Givr3tjy4+EYAkvgrRIOkQcl10M3THz7RdLWqe65x6coG
1rlvo419U6w+q0cQZpgiLc7kZ4vSMYpOfN+5l8ZGDnaPqHMsuNGWNdDCrKqqp1C6u98t
IxFhyEd1E+m4ctzLjSK0Hup0zefgvsruEs80+FuX1jOt7vakrQ1TQg7SxNFqa6PKY1f2
0J4g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734592716; x=1735197516;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=g27M3iObPvhbrCTv91lyWvzbV6VPtZa19dTQmpnInAs=;
b=fyY/z4Q8eoVeb8bjWPobbQ1HfF0lsmba0eizqNzTiUKJ7xOWedk9CqnTLQIevcTFix
dmuprvX3WIyLeZK+YkT3r2wtLToFExNese9MCZ6vU7kLv4kpp91j+S8uAW0FtwSKpV+C
N0eWePqqovg4hitye8lgC59xMV2wBJdo6bE9Vu7NlnELMU97SHrQBCJbRvqJ8T7LTlpp
/SF7uwR9T21A3k0CpQ7CRCuaLSX+BPEXwiyouVYFKGDynPkaWYsWeFgYAME1/nO4WnSh
XN5FC8YP9qFaGZmGw3dUhoAwjRaFZkAltlXmk1PWpI56yj9TBGwk+un8DGljO2Vplx5m
458A==
X-Gm-Message-State: AOJu0Yx1T+WkWd0yIrXe28aUKGvOl+r1KCdnFdqAHc6XzgRZ5eSHpJs9
aT9TkOBLnr3S+zWT9hd9sn3ZuJs7DpYfGCwiq+R9fAcPOs0ED6tw9xdeF3wKJdA=
X-Gm-Gg: ASbGncu3hu8vCucjfhzQJlBmdLVvsNdK+JiS1ANYdEg9QP8DL3SWn5oMVhkbozmCG/y
XHsADGqKLNn5dWcM6fTeey9YoGlkZRfPQNrD8kMplyicS3QCdqnpcSn4YOAXZzc3qe8dtOunB+I
r0hujA2hwzHdmsvG774gD2/25JWm5rw9jRetaKCM54gd2yzP9GSITy8WhIpRwJDfX1OzSgpt2Oy
iVvgbqNes9MScL5p8uLNxBGzxnRipI1IfIOl9iYBpcd9NVU45BO27i7f0h0PXmYYhgpDAOWklE=
X-Google-Smtp-Source: AGHT+IGIhOeGzGe4R70NRiimOBfbgieRxj7Fq4SiE3p1SIPxmJz9XRiVjQklpsGR5KZuNLbr2rZbUg==
X-Received: by 2002:a17:90b:2d43:b0:2ee:b8ac:73b4 with SMTP id
98e67ed59e1d1-2f443d5725cmr3051609a91.36.1734592716381;
Wed, 18 Dec 2024 23:18:36 -0800 (PST)
Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89])
by smtp.gmail.com with ESMTPSA id
98e67ed59e1d1-2f2ed8304absm2833241a91.24.2024.12.18.23.18.35
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 18 Dec 2024 23:18:35 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 74962 <at> debbugs.gnu.org
Subject: [PATCH 2/3] etc/guix-install.sh: Explicit shebang to use /usr/bin/env.
Date: Thu, 19 Dec 2024 16:17:51 +0900
Message-ID: <a2297d9739113db7e5166b9ee3d8fdb1db8e2cf4.1734592672.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <f7f432d7d1672c8934a4a3f50db4b858f1261f66.1734592672.git.maxim.cournoyer@HIDDEN>
References: <f7f432d7d1672c8934a4a3f50db4b858f1261f66.1734592672.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Janneke Nieuwenhuizen <janneke@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74962
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Having an explicit shebang tells something useful: we depend on Bash. Tools
such as shellcheck make use of it. The original technical reason for avoiding
/usr/bin/env is no more (Guix System lacking it).
* etc/guix-install.sh: Adjust shebang. Remove conditional 'exec bash' further
block below.
Change-Id: I3c92a9e58fe11610dfbf74dbbd4b1ac8852abcf0
---
etc/guix-install.sh | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index f07b2741bb..481eb6f12a 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# GNU Guix --- Functional package management for GNU
# Copyright © 2017 sharlatan <sharlatanus@HIDDEN>
# Copyright © 2018 Ricardo Wurmus <rekado@HIDDEN>
@@ -9,7 +9,7 @@
# Copyright © 2020 Daniel Brooks <db48x@HIDDEN>
# Copyright © 2021 Jakub Kądziołka <kuba@HIDDEN>
# Copyright © 2021 Chris Marusich <cmmarusich@HIDDEN>
-# Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
+# Copyright © 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
# Copyright © 2022 Prafulla Giri <prafulla.giri@HIDDEN>
# Copyright © 2023 Andrew Tropin <andrew@HIDDEN>
# Copyright © 2020 David A. Redick <david.a.redick@HIDDEN>
@@ -31,10 +31,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
-
-# We require Bash but for portability we'd rather not use /bin/bash or
-# /usr/bin/env in the shebang, hence this hack.
-
+#
+#
# Environment variables
#
# GUIX_BINARY_FILE_NAME
@@ -50,11 +48,6 @@
# installation required the user to extract Guix packs under /gnu to
# satisfy its dependencies.
-if [ "x$BASH_VERSION" = "x" ]
-then
- exec bash "$0" "$@"
-fi
-
set -eo pipefail
[ "$UID" -eq 0 ] || { echo "This script must be run as root."; exit 1; }
--
2.46.0
janneke@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.
Received: (at 74962) by debbugs.gnu.org; 19 Dec 2024 07:19:32 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 19 02:19:32 2024
Received: from localhost ([127.0.0.1]:37217 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tOAol-0006rQ-V0
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:19:32 -0500
Received: from mail-pj1-f43.google.com ([209.85.216.43]:48185)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tOAoj-0006rH-L1
for 74962 <at> debbugs.gnu.org; Thu, 19 Dec 2024 02:19:30 -0500
Received: by mail-pj1-f43.google.com with SMTP id
98e67ed59e1d1-2ef760a1001so398909a91.0
for <74962 <at> debbugs.gnu.org>; Wed, 18 Dec 2024 23:19:29 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1734592708; x=1735197508; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=de94PPeOgiMMef9HvPbGamBHofxuLfh2XkrwwTFee24=;
b=h1pu/+JyOSXbH8D1l0AqoW0O40DngyMeGa9u1UPK+juryrrY4hku1ZrkhnRzgC4sPq
4+f/99AJeJXI19tsAxu8ml62zChPGHp4bGqCvhK9CZHerQIgOsnfPjkw8KN20T+rO0QK
QcTmQ3v/gxSHR5VDNwQG15TmvqBrL/FUB3tVR0uwzl3scjgxLo+6d+7znr3tBtPrpYB0
PO2IKZGFUIemAwbr5s0QGa4Keg8IRPTgRBDNvyctw0rb2DijvRICMyJ/BLzW5ZeWVCwe
EmQpgPo8PiF4oLTmSnS7bD0g9vbLkpcrWoQ3UriGyINz54tQpUPLorRFu+ow64yHiGS/
38Tw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734592708; x=1735197508;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=de94PPeOgiMMef9HvPbGamBHofxuLfh2XkrwwTFee24=;
b=gJtZcxKjgUmR253EfjHWgKNzRNPaH8FlKP3pzWEGWSdllZJT8lJMchcuQEsnT4rotE
BgwvEyFCQAzduk9dBYuFNaPDRrqKdJUqdNU5qNxxEYIHfmWItxjkp75LIFNPq2H1l9O7
9iepuuoqPeVP1MbsAFRKQVBKfIEJcK2yAke4pow4vyC8oKQ3mg6JKI87WtB+Us1iUTip
dz7KkKuu6ixw+Ujaao+ShJ763KIaeytG1tmxAQ7S3r17ebsQbBrWk09Y3nVas1v9vng6
V4BMTFBoYOSiRvB85JaZmjAysO9hsvC37AK7JRg2O3zbX3aedJL3iGoxPZ1+ZgtRmXW0
6I0Q==
X-Gm-Message-State: AOJu0Yz1Hk3PCjzZ7jlpuXUMH3wwLkZI43uXSrZgxA3vbWDUJHkbbJpr
b0olHDbJtGYcQjW0ndKz2Eep1Y+Z1NFW5KmS+Ten+KaIVFQ7DauSIP+Ak5b0Or8=
X-Gm-Gg: ASbGnctpBrtuVqBgTCXn53391kfrKNh8c4uOd+00P4kXCU+dSGmM3n25qvFEQq1rxa2
kZK2VGmup9akGCtQjHp49szkoDDrf4O2fLz89TSuSeO3DFeYy4UpYdfKnHD+SOmMt6Fk00BN7uv
321Kv+tRjir1gzkOgcVAMcIAltoUhb38sEpWn5XyI7AKrEHjfmErWXnI5i2kHfGfK7+BlmKfqdi
JfnvHu2zyPIzoadwYUCBtBRq6a/6dZESP/e7NGosb85xW3fTGMOQWDbfzWj1qIosUtumsfsvNU=
X-Google-Smtp-Source: AGHT+IGhc4zc46pI46JSVJaqt4x3k3fTw6bTLLWBUovFCWwOJHycsxPxVTxBJLP7P2wYHBbeRxwM2A==
X-Received: by 2002:a17:90b:1a88:b0:2ee:d024:e4fc with SMTP id
98e67ed59e1d1-2f2e936a09emr8733999a91.33.1734592707793;
Wed, 18 Dec 2024 23:18:27 -0800 (PST)
Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89])
by smtp.gmail.com with ESMTPSA id
98e67ed59e1d1-2f2ed8304absm2833241a91.24.2024.12.18.23.18.26
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 18 Dec 2024 23:18:27 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 74962 <at> debbugs.gnu.org
Subject: [PATCH 1/3] etc/teams.scm: Add etc/guix-install.sh to installer team
scope.
Date: Thu, 19 Dec 2024 16:17:50 +0900
Message-ID: <f7f432d7d1672c8934a4a3f50db4b858f1261f66.1734592672.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74962
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* etc/teams.scm (installer) <#:scope>: Add "etc/guix-install.sh".
Change-Id: I351476c3150c25c8d403e9a4ff0a05c98b9d1821
---
etc/teams.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/etc/teams.scm b/etc/teams.scm
index 6b492f1d4b..fb6a30ed2f 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -10,7 +10,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022-2024 Ricardo Wurmus <rekado@HIDDEN>
;;; Copyright © 2022 Mathieu Othacehe <othacehe@HIDDEN>
-;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
+;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
;;; Copyright © 2022 Simon Tournier <zimon.toutoune@HIDDEN>
;;;
;;; This file is part of GNU Guix.
@@ -523,7 +523,8 @@ (define-team translations
(define-team installer
(team 'installer
#:name "Installer script and system installer"
- #:scope (list (make-regexp* "^gnu/installer(\\.scm$|/)"))))
+ #:scope (list (make-regexp* "^gnu/installer(\\.scm$|/)")
+ "etc/guix-install.sh")))
(define-team home
(team 'home
base-commit: 17c0aa6192f6a90c227e92720f2d63240996d0d4
--
2.46.0
guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 19 Dec 2024 06:58:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 19 01:58:15 2024
Received: from localhost ([127.0.0.1]:37187 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tOAUB-0005qQ-3H
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 01:58:15 -0500
Received: from lists.gnu.org ([209.51.188.17]:54278)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tOAU8-0005qI-UN
for submit <at> debbugs.gnu.org; Thu, 19 Dec 2024 01:58:14 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <maxim.cournoyer@HIDDEN>)
id 1tOAU8-0006hS-Ln
for guix-patches@HIDDEN; Thu, 19 Dec 2024 01:58:12 -0500
Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <maxim.cournoyer@HIDDEN>)
id 1tOAU7-00059z-1O
for guix-patches@HIDDEN; Thu, 19 Dec 2024 01:58:12 -0500
Received: by mail-pl1-x62f.google.com with SMTP id
d9443c01a7336-21634338cfdso5758485ad.2
for <guix-patches@HIDDEN>; Wed, 18 Dec 2024 22:58:10 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1734591488; x=1735196288; darn=gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=S6cryWGRFbiIw073CMK83xjbngpe6oxgj6/55p5pWtU=;
b=OFO2DEWFaLQwkZanDTF/xc13VYloN8myAjaYA189HoZOL9em9bBHDGV5pEdsCZotVr
pJXZlMlUIegZe4IUOXYlQG12eOpjZWA1AvJJhYv3zn7IivfirZ4XRzyTD/t98EG1LFax
BTS14GwxE54uUbadVmT7gTGKp5kmcYmh9J8I0fjW1UBj1i0KoMxDWLQXrRVyTOOwAnng
Sg1+PQ8h8WBCWhUvTBlPHWf9rByg5zimHhesoK1+pKteMS8qeJO5dj1V+jdDsqccw/iv
ltQtYz9GtHDoU70+r5EN+eIGR40ytqS7eQmXnzf4wIj2CzoF6hxlgfpSAe6R2QDVNs/G
vYoA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734591488; x=1735196288;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=S6cryWGRFbiIw073CMK83xjbngpe6oxgj6/55p5pWtU=;
b=jBEQb7P5N1/M3t4mccMMb4uykENvBw0e0jFRp7eNL1f/IMKJlcQ3GKgMKgmRt6n3Kl
OCa6HhMcSB4JUlEWXt1+Sb6yhtt/4l6Vt9oTMY1InR1leYJPd16k9sbBAgS4djPcGxlR
+JkNiqmAzTRcQctvzny2A9j7vsRR3r6R2ZEBhb8xSsSdcvdQtiaNMDaDIBoiHlc/92tv
f99c6IxyTGqCwVfoA8c9oWsfJx32QSZFjhcDS16iXEYfEXcmji4wgyxmQsRu4RUcJnBv
s9q8g5A5L90nesAWWvT1cgKPvpVNGL2ZIqw7z2o3srH6DsxhyLbdQLuQMaStmFCZHENC
hpNw==
X-Gm-Message-State: AOJu0YzPB2JxKg1WCMbaQNFzP2OmxhsGZzacixHifIyTNyd3pfx/8ouy
+Q81cQCkk78Cyp7+BVb6EbU/ugAIqlvUe9rthLzheknxyM5Y3wWmSKN19B2O37w=
X-Gm-Gg: ASbGncsSdW+0aw1vQUgqVKjBh0jMITgcZOlnuvQmbpHW4NoLPaH01fQLdCxWZqfeHV1
1HzE/AhEOGxzZSA6TbA0K7IQAnbCK5A4bLDwfigr8q51VoCsDksatLNkqtwCS9Zi2k0upuF2na7
dA7/tvSdNmOejEHeUrtWRkPEQo4AfMY+FtaIa6PcIOn4Zj99qS2ijbDR/8rr20i1m5JRgifq2ox
drcxCecpFrP7Zp6y0XHGCh59uGQXRNQify6+B9FIsE3hybw8iHZ0vSnGUcX2eDgHAX0T4qnQik=
X-Google-Smtp-Source: AGHT+IEOlXB3nj1YtRcYFxLRIqsXVO6RV6JttwdExU8VoSDMzl3NF6+wTjXh4F2nd3yTpKE+RVTNRg==
X-Received: by 2002:a17:902:db0f:b0:217:89da:fd54 with SMTP id
d9443c01a7336-218d722f88fmr95716015ad.33.1734591488349;
Wed, 18 Dec 2024 22:58:08 -0800 (PST)
Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-219dca04c85sm5779665ad.271.2024.12.18.22.58.06
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 18 Dec 2024 22:58:07 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] etc/guix-install.sh: Explicit shebang to use /usr/bin/env.
Date: Thu, 19 Dec 2024 15:57:53 +0900
Message-ID: <0e7da0b076ebc6a90ae1c8c2c760b89ad6dd1d5e.1734591473.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
MIME-Version: 1.0
X-Debbugs-CC: ludo@HIDDEN
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::62f;
envelope-from=maxim.cournoyer@HIDDEN; helo=mail-pl1-x62f.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-Debbugs-Envelope-To: submit
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)
Having an explicit shebang tells something useful: we depend on Bash. Tools
such as shellcheck make use of it. The original technical reason for avoiding
/usr/bin/env is no more (Guix System lacking it).
* etc/guix-install.sh: Adjust shebang. Remove conditional 'exec bash' further
block below.
Change-Id: I3c92a9e58fe11610dfbf74dbbd4b1ac8852abcf0
---
etc/guix-install.sh | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index f07b2741bb..481eb6f12a 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
# GNU Guix --- Functional package management for GNU
# Copyright © 2017 sharlatan <sharlatanus@HIDDEN>
# Copyright © 2018 Ricardo Wurmus <rekado@HIDDEN>
@@ -9,7 +9,7 @@
# Copyright © 2020 Daniel Brooks <db48x@HIDDEN>
# Copyright © 2021 Jakub Kądziołka <kuba@HIDDEN>
# Copyright © 2021 Chris Marusich <cmmarusich@HIDDEN>
-# Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
+# Copyright © 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
# Copyright © 2022 Prafulla Giri <prafulla.giri@HIDDEN>
# Copyright © 2023 Andrew Tropin <andrew@HIDDEN>
# Copyright © 2020 David A. Redick <david.a.redick@HIDDEN>
@@ -31,10 +31,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
-
-# We require Bash but for portability we'd rather not use /bin/bash or
-# /usr/bin/env in the shebang, hence this hack.
-
+#
+#
# Environment variables
#
# GUIX_BINARY_FILE_NAME
@@ -50,11 +48,6 @@
# installation required the user to extract Guix packs under /gnu to
# satisfy its dependencies.
-if [ "x$BASH_VERSION" = "x" ]
-then
- exec bash "$0" "$@"
-fi
-
set -eo pipefail
[ "$UID" -eq 0 ] || { echo "This script must be run as root."; exit 1; }
base-commit: 17c0aa6192f6a90c227e92720f2d63240996d0d4
--
2.46.0
Maxim Cournoyer <maxim.cournoyer@HIDDEN>:ludo@HIDDEN, guix-patches@HIDDEN.
Full text available.ludo@HIDDEN, guix-patches@HIDDEN:bug#74962; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.