From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id yJUuAAUdzWIOHQEAbAwnHQ (envelope-from ) for ; Tue, 12 Jul 2022 09:04:37 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id KJOvOgQdzWI8mwAAG6o9tA (envelope-from ) for ; Tue, 12 Jul 2022 09:04:36 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 991D029885 for ; Tue, 12 Jul 2022 09:04:36 +0200 (CEST) Received: from localhost ([::1]:33002 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oB9wf-0007Fu-Gb for larch@yhetil.org; Tue, 12 Jul 2022 03:04:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oB9ek-0004pA-F9 for guix-patches@gnu.org; Tue, 12 Jul 2022 02:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47607) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oB9ej-0003Z7-VM for guix-patches@gnu.org; Tue, 12 Jul 2022 02:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oB9ej-0003j9-PZ for guix-patches@gnu.org; Tue, 12 Jul 2022 02:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56050] [PATCH v2 2/2] etc/guix-install.sh: Check for profile from 'guix home'. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Jul 2022 06:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Philip McGrath , 56050@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Philip McGrath Received: via spool by 56050-submit@debbugs.gnu.org id=B56050.165760830514250 (code B ref 56050); Tue, 12 Jul 2022 06:46:01 +0000 Received: (at 56050) by debbugs.gnu.org; 12 Jul 2022 06:45:05 +0000 Received: from localhost ([127.0.0.1]:41504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oB9do-0003hk-QJ for submit@debbugs.gnu.org; Tue, 12 Jul 2022 02:45:05 -0400 Received: from relay10.mail.gandi.net ([217.70.178.230]:42391) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oB9dm-0003gr-8s for 56050@debbugs.gnu.org; Tue, 12 Jul 2022 02:45:02 -0400 Received: (Authenticated sender: andrew@trop.in) by mail.gandi.net (Postfix) with ESMTPSA id 40096240011; Tue, 12 Jul 2022 06:44:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1657608296; 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=aGHOD+r+SpBjcBq8LLLaEqiWKGsMQ2GYXfUomuiMxG8=; b=mU3WEEG52kgnSOAZpMQW2GBEMibgRWo3HNlBQamLH20HIAI/b+o9oTn7gPTQgzSmaAf8L7 sTjm+c+7jRU+1dFbXe3VqEJzAB3Yws/xt4VjAydWQsp1XxW+9X3SDF+w68wDWvJ2Qcg5xy Sjak6WdeuPoNfmG+NxMysb031zUhm7BxAR2fSjkluoubvPmI9+Yn8v3b5iYyH9gEJ6iuYU NWk2aXYnSrIVOXG9xfwB/kyycD6wai9BGzVWmi3gY4D2WeJRKZehlUTghBP7/d9ERQXYNG /2EsfHutNjQku5Ujz68hcn5hJl8GRoW0WG379kE/AdKk+ubZ+zWwjALD5WQZwg== From: Andrew Tropin In-Reply-To: <9e68ef3237150756a97d0e3eba94a6b08879eeca.1656899134.git.philip@philipmcgrath.com> References: <9e68ef3237150756a97d0e3eba94a6b08879eeca.1656899134.git.philip@philipmcgrath.com> Date: Tue, 12 Jul 2022 09:44:51 +0300 Message-ID: <87r12q25jw.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1657609476; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=aGHOD+r+SpBjcBq8LLLaEqiWKGsMQ2GYXfUomuiMxG8=; b=SNMCteexb6KpsNDt+nVXwNHOAXDwcwi47B+4y4HaLpzyBvnRCpCKPchuV0NqB12kuTKDcW 6eGd64wI0S7smVDgPY7eUrKxsrPY62AVc3njAP0z3xLj8qF4VJiwG9sf0+WAO/ZgEBm3J5 OmropXzcROwezgqK5km7MdfEevwnCqbHD1FL1zX3uGpKGlnP7rXX7fi2RH8pybUWwy/SXQ LANrGBoDmKb3ChEEBMrmxB5P+w9qqz1R38rpRwEk04fzKXxk4jgzE6um6hZe1XrTkrb0iU Ua2lbiv1uyeHyW/UVNUXLw1atia8Qu/nzBlfEApLufvMSS+oUb9GPuBQqQDMrw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1657609476; a=rsa-sha256; cv=none; b=W3Rzb/Jb1FxhjRdY4WJJIQLahASQNVhea8ezFmfs1rtfShvjPgKoyA96IhRugTdHST5lOl ZzJB0jBo8PRL8Yz5gXESYNpJbFulueUVF/y7PxvAmrB5TRoysG7aFwnj5G8CVessdqQ00o tMlp6jFCpA0D4zyxFn+MU2qO2Yba0kMcHqJm/bQkVdtR2xCFnXox7MksqhEos4FybK25QW owd+UqD5SKvlN/iqikyzS/EN/s2uCYuiJ8FX4IMbeEajej6P/H6dgd/kbdd1LahPc2MkeT UnQ4QUulos6e1Khwd7TfNSsoKW8UusQiUT9hkuNrcWAhS1X8QdtxKL90QjAqUg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=mU3WEEG5; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.05 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=mU3WEEG5; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 991D029885 X-Spam-Score: -1.05 X-Migadu-Scanner: scn0.migadu.com X-TUID: rGO7VjJzIgH8 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2022-07-03 22:35, Philip McGrath wrote: > If "$HOME/.guix-home/profile" exists, use it for GUIX_PROFILE instead of > "$HOME/.guix-profile". > > * etc/guix-install.sh (sys_create_init_profile): Check for 'guix home' > profile. > --- > etc/guix-install.sh | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/etc/guix-install.sh b/etc/guix-install.sh > index 62a33a55c4..300681e111 100755 > --- a/etc/guix-install.sh > +++ b/etc/guix-install.sh > @@ -524,7 +524,9 @@ export PATH=3D"$_GUIX_PROFILE/bin${PATH:+:}$PATH" > export INFOPATH=3D"$_GUIX_PROFILE/share/info:$INFOPATH" >=20=20 > # GUIX_PROFILE: User's default profile > -GUIX_PROFILE=3D"$HOME/.guix-profile" > +# Prefer the one from 'guix home' if it exists. > +GUIX_PROFILE=3D"$HOME/.guix-home/profile" > +[ -L $GUIX_PROFILE ] || GUIX_PROFILE=3D"$HOME/.guix-profile" > [ -L $GUIX_PROFILE ] || return > GUIX_LOCPATH=3D"$GUIX_PROFILE/lib/locale" > export GUIX_LOCPATH I think here we don't need to prefer one over another. Let's just repeat the process for both of them. If home profile exists source it, if user profile exists source it as well. =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmLNGGMACgkQIgjSCVjB 3rAL+Q/+PwVXkPWCwr3FHfpGhZmheO1TIT5ybtxnCGLIH0Du6znYAfMeRn9Zu9SL Fl5EAtGixEwpOklzu1vF/M72ISYQ84w2uBUCR7HYBHoz2NJT1AksAWznKX4tG7ZD GxBqV0aylkbIkEao6Abdf9Gwq21O7pOYwdHEw/X1XW4ItK6ofOkZ07ga2KllVgDE dE1f32bWIFnYLdGDwwYlOfm9ximtOzt552t0D08AineXESh49Rk/ejcxViTNCOrz d6GEE6tu5D9yy0+/wp/Fytfe1LtbOBD3ZynBEHb2Nprw8sLxAsLsJ2AVRcC75eQ8 dcpzuUsdAkeKxCmBr4Eu1jzkbAgwUjgMpJ/azMCVx7yyEW7c9e8JrJI7pL6M/Yij frCVMQJI2ShR7YrTDFksNj9utMpAnFtccikuMfZUj/4MNd37pSKRfinEq8wC7SFZ J11NeVURUUUk/PM85omWzcIgG2rSpUIvQNbmsue9BWW7Ft9u/zO7eozjSSInOmwD A9dpxPolov9H9xtdqPUmEEu8Myr2aGZS2niPLKiSGA1yehvjHZANHQrgTUOMzqr5 mAen0mXJaEokgzwJpGcnYAOLV0WcmiQKFgrc/fiY7HlCeRohKncPQAYiP/P3CHoF soqs3B8ebXQ/v2mRXg+W8KyLanq/yxKZIN6e2Lw5q0KkUEdpuYQ= =yfgI -----END PGP SIGNATURE----- --=-=-=--