From unknown Sat Jul 26 23:56:31 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#60778 <60778@debbugs.gnu.org> To: bug#60778 <60778@debbugs.gnu.org> Subject: Status: [PATCH] guix-install.sh: Source both profiles, default user's and home. Reply-To: bug#60778 <60778@debbugs.gnu.org> Date: Sun, 27 Jul 2025 06:56:31 +0000 retitle 60778 [PATCH] guix-install.sh: Source both profiles, default user's= and home. reassign 60778 guix-patches submitter 60778 Andrew Tropin severity 60778 normal tag 60778 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 13 05:22:05 2023 Received: (at submit) by debbugs.gnu.org; 13 Jan 2023 10:22:05 +0000 Received: from localhost ([127.0.0.1]:49640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHCH-0006fB-4D for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:22:05 -0500 Received: from lists.gnu.org ([209.51.188.17]:42294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHCF-0006eg-2V for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:22:03 -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 ) id 1pGHC4-0008WU-Mt for guix-patches@gnu.org; Fri, 13 Jan 2023 05:21:52 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGHC1-0005uY-Ou for guix-patches@gnu.org; Fri, 13 Jan 2023 05:21:51 -0500 Received: (Authenticated sender: andrew@trop.in) by mail.gandi.net (Postfix) with ESMTPSA id B6670FF810 for ; Fri, 13 Jan 2023 10:21:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1673605306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=MjGEhdkUdZueb7+sK3QyH8EBPBXZ+GUQxTyBzu+/mLQ=; b=f61ozkARHKtodT4swGLmKpqy3lUoI98mZD1fLgQoBzQQRMli0Rns9sNGkwQTmWTYvzyndh rYcnsv1sdFFMii8mphn1H/gf71cVbvnfIEnCjoM3vpmzkwD4W++UKa+n/w4q0b45kVkXh9 +dk0WTqvnK/F7YhMJJnqq/bv7MertYKntZDf2MgZV0jfYSo2vQeVt+zkZFVNZjAKF7zheN wh/dyseQQGIE3kp52BCuQ5+2N0vnnvtMwWfgihvG2uuPg/0QF/MF1gnqdLDVkgJiy5UcYI PTh4HQsycN7K611iRmQo1VhcVFsCpx8+/D8K5C5WwNyVBPg/moG63o0Wx5jNmg== From: Andrew Tropin To: guix-patches@gnu.org Subject: [PATCH] guix-install.sh: Source both profiles, default user's and home. Date: Fri, 13 Jan 2023 14:09:02 +0400 Message-ID: <87pmbi20qy.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=217.70.183.199; envelope-from=andrew@trop.in; helo=relay9-d.mail.gandi.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable * etc/guix-install.sh (sys_create_init_profile): Source both profiles, defa= ult user's and home. =2D-- Sourced both profiles and both added to GUIX_LOCPATH if they exist. return outside of the function AFAIK doesn't make sense, removed it. In some future we could make a dummy locale-consumer package, which will ma= ke $GUIX_PROFILE/etc/profile export GUIX_LOCPATH, so special treatment in this script won't be needed anymore. etc/guix-install.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 3ce9affc06..79f5be66b1 100755 =2D-- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -11,6 +11,7 @@ # Copyright =C2=A9 2021 Chris Marusich # Copyright =C2=A9 2021, 2022 Maxim Cournoyer # Copyright =C2=A9 2022 Prafulla Giri +# Copyright =C2=A9 2023 Andrew Tropin # # This file is part of GNU Guix. # @@ -534,15 +535,19 @@ export PATH=3D"$_GUIX_PROFILE/bin${PATH:+:}$PATH" # searches 'Info-default-directory-list'. export INFOPATH=3D"$_GUIX_PROFILE/share/info:$INFOPATH" =2D# GUIX_PROFILE: User's default profile =2D# Prefer the one from 'guix home' if it exists. +# GUIX_PROFILE: User's default profile and home profile +GUIX_PROFILE=3D"$HOME/.guix-profile" +[ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile" +[ -L $GUIX_PROFILE ] || \ +GUIX_LOCPATH=3D"$GUIX_PROFILE/lib/locale:${GUIX_LOCPATH:+:}$GUIX_LOCPATH" + GUIX_PROFILE=3D"$HOME/.guix-home/profile" =2D[ -L $GUIX_PROFILE ] || GUIX_PROFILE=3D"$HOME/.guix-profile" =2D[ -L $GUIX_PROFILE ] || return =2DGUIX_LOCPATH=3D"$GUIX_PROFILE/lib/locale" +[ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile" +[ -L $GUIX_PROFILE ] || \ +GUIX_LOCPATH=3D"$GUIX_PROFILE/lib/locale:${GUIX_LOCPATH:+:}$GUIX_LOCPATH" + export GUIX_LOCPATH =2D[ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile" EOF } =2D-=20 2.38.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmPBMLUACgkQIgjSCVjB 3rDrqQ/+MzfgLFxKMU4k0qC+wDeKNvyjqQFG1unvW3M7Cm0Szedd42Sas52PzdDa fnIUft2X8S09CUM5p3u/VEpXntEgcyl2WTcAZkaltnreyiPFL4h0EtVU5ksiOirh MO+//dPVr5/JDO/u8rwT2brz5pg8eeUt2ji8Ehq8MTq1sWcyZKkGm57l4wLSIfqC dD8r3t1GVnS4rVb4JgodUFxwNNkqxg7JOezsisMvKiEGYzqBgAK1UyHf1v/wS4iV w9bvGkkSuhkYvRBKeicljMu4tUqUssjeKiNgecw2I97tdMA57entUkQ7h2mNRZgn tWSvvR7a7s5vp8hrUL+7HCI9QpHWEq29dPuZAtpmoM1t5yGwpSUL224A0Np3DRbx HRVs1uSHbunIv3FV+pQ8oDpr8OlhAJzLTnYfGgsv+N4PrAht5sHR/QNn9l3kFjgI bvwB39uOJTq4CVi8Neq9cvAnnnvKDiospZY7oFM0KwxEU/kgm1fvdYhHmbQFP893 SePwcwpnYwSLIv9TeZUsdSHEYEavbPmxD+uMLOme1Ks+6hkI5TR5fHC/W5ljTXWK ulS3lCENMF7dFkpPHuxt1DvFjZWM3Tfaf+eG5RkCE9JQfnelC3xO2wFWQFC/jUf1 CjTtCW8Rp17cGeGpfSHFha6UJkhgB0J5fmEob7WLgf0EU/2mXek= =css4 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 07 11:24:17 2023 Received: (at 60778) by debbugs.gnu.org; 7 Apr 2023 15:24:17 +0000 Received: from localhost ([127.0.0.1]:57074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pknwn-0008AP-0S for submit@debbugs.gnu.org; Fri, 07 Apr 2023 11:24:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pknwl-0008AC-Iy for 60778@debbugs.gnu.org; Fri, 07 Apr 2023 11:24:16 -0400 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 ) id 1pknwf-0006Mp-Jr; Fri, 07 Apr 2023 11:24:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=GEP+3mr1X0k+qQBJ+Xz5kFJ9wr6OJp6c+11mAxvz4Ls=; b=Cr/2PdvJRKHulGUSGyW3 jFUs9MpFH0w2XtrE1KzbqpYPefO+5fwClho440HjRzEMM3CHRzAj7rasT/BftivZ4u0jr5lglLws+ ZSXYFDDgaqV6QwqvZRpamM9Yb3aMAo/MyCV7UuPaUHgN4OuLQwpCzNx+oLw9O7mVT99L7tYVMAdCk nKVkd89Zbh/h6N0MKQvREpMZXVsIhgdp/Q8xlp9vbC01na+CPmjh6VVsd6QuAVNsLFUC32Xh3McpG 4kfSytCYFdCDh5FR5KTYiuDoANr3kn8QAVwrqx+kSOew+Y9gE27MGWrdYjClnyp6G165KT5ogVkUY v85qmVz0Xx48DA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pknwe-0006ne-TR; Fri, 07 Apr 2023 11:24:09 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Andrew Tropin Subject: Re: bug#60778: [PATCH] guix-install.sh: Source both profiles, default user's and home. References: <87pmbi20qy.fsf@trop.in> Date: Fri, 07 Apr 2023 17:24:07 +0200 In-Reply-To: <87pmbi20qy.fsf@trop.in> (Andrew Tropin's message of "Fri, 13 Jan 2023 14:09:02 +0400") Message-ID: <87a5zjd8bs.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) 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: 60778 Cc: 60778@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Andrew Tropin skribis: > * etc/guix-install.sh (sys_create_init_profile): Source both profiles, de= fault > user's and home. [...] > +[ -L $GUIX_PROFILE ] || \ [...] > +[ -L $GUIX_PROFILE ] || \ This should be enclosed in double quotes. Otherwise LGTM, thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 09 03:08:11 2023 Received: (at 60778-done) by debbugs.gnu.org; 9 Apr 2023 07:08:11 +0000 Received: from localhost ([127.0.0.1]:60170 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plP9n-0001Co-Ch for submit@debbugs.gnu.org; Sun, 09 Apr 2023 03:08:11 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:36329) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plP9d-0001CB-RG for 60778-done@debbugs.gnu.org; Sun, 09 Apr 2023 03:08:09 -0400 Received: (Authenticated sender: andrew@trop.in) by mail.gandi.net (Postfix) with ESMTPSA id 05D6CC0004; Sun, 9 Apr 2023 07:07:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1681024076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=EFH8OxN1ppupc/NZxN/0J0nNbtNbc2MnuRV5TEkhIUw=; b=T+OFvVM9MhUlALDYf6+P9HNcqIrriGzsdIY91Nfo6YWtDmDpDLRhPq94rajUM/531+44EM gSsN2yidPbPocdRH+zDSM/t+QJY5y3b2y4mEhjxRFoTqay1dWJwMOy81VDE98fwQVl5L1T p39Hs6Q7v382SxM96ksCp50R8NiMUkVKQcZbZRoMzPimScBv8ESl4P15rbNEy7x2gnY2Sy c5I3ItPw0Cd/wkuRM8zvt7oksfuXPP+dNaXli7+kq18xGvbAVufZKIJzYuciMIaKCLWSV7 2hGA7f+5PZpT7ncvngFddayp+Fs6jTmp7l1Z6J1/P1XRbAsHlCzkMHq3eq91bQ== From: Andrew Tropin To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#60778: [PATCH] guix-install.sh: Source both profiles, default user's and home. In-Reply-To: <87a5zjd8bs.fsf@gnu.org> References: <87pmbi20qy.fsf@trop.in> <87a5zjd8bs.fsf@gnu.org> Date: Sun, 09 Apr 2023 11:07:41 +0400 Message-ID: <87edotcz42.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 60778-done Cc: 60778-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2023-04-07 17:24, Ludovic Court=C3=A8s wrote: > Hi, > > Andrew Tropin skribis: > >> * etc/guix-install.sh (sys_create_init_profile): Source both profiles, d= efault >> user's and home. > > [...] > >> +[ -L $GUIX_PROFILE ] || \ > > [...] > >> +[ -L $GUIX_PROFILE ] || \ > > This should be enclosed in double quotes. > > Otherwise LGTM, thanks! > > Ludo=E2=80=99. Thank you for the review, adjusted, applied and pushed as https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3D02033bfc05 =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmQyZD4ACgkQIgjSCVjB 3rBIow/+N2BigEkRSbPS4n+gmk2Q8KdsMlpn+FXgeUn74QgOEEA/1fxV7cPtoVq0 kceX9DTx4UU/QD6dZ0Ov/g2/u7PQAf8LI1jPc+CM4MF9E1gUS9aLKmtMj9VOhydm nE5H6XNMI263ywYhtfvIYrQw5+5SC6AtUF3dHqHFYqfaWP9QIZZRK8Q86fPxcb0u /2Crmw0Jb7Hbf6DQs6x9tIwzVluNn738w+YSsi1/lVCp0JjJO3RoRTXQPY5qPxzo 3Vl1BTuI8SEzigJ5CNmxXOPrn1M+MhLufFf9JchwTlvsV/D36u517k9vK2JL2Jzt AF32kmCIIMaVfyhQS80TySWSyOppaemWigVz94+L9Fn/av8BI5ABoBLISgbkf4+I wbhI0hdqhYea3fS9cBMmUMKUmfEtCu9gC7Tvk+Lk51aRFkHpY8fzSszxNcnI09Xc EY9McoH5droaBRdZG5JaDI4queVOY6hnxmv06XGlzmOVi3T/En1Y5KSqIXuSZHhW QELcy9Hd2eeWX2OReu0rJEXsbJS7BzQu2PgihjyauQKOd+SNJkYyO4D7mx1Uav5x UqISngr5tU/ZcEJzRY1lt+73EvkTaVEl19vL7euVP9n1XCEYWNr2LwnZ8W21LEPh EusGsFphHVwiTRQg3WEzPQFLg0VGrLH6FrMEp/eSK2DzBAJ4ELo= =mb6B -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Jul 26 23:56:31 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 07 May 2023 11:24:13 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator