[bug#59127] [PATCH] guix-install.sh: remove unnecessary XDG_DATA_DIRS export.

[bug#59127] [PATCH] guix-install.sh: remove unnecessary XDG_DATA_DIRS export.

[Prafulla Giri via Guix-patches via]

[-- Attachment #1.1: Type: text/plain, Size: 45 bytes --]

Hello there,

Here's a small patch.

Regards.

[-- Attachment #1.2: Type: text/html, Size: 438 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-guix-install.sh-remove-unnecessary-XDG_DATA_DIRS-exp.patch --]
[-- Type: text/x-patch; name=0001-guix-install.sh-remove-unnecessary-XDG_DATA_DIRS-exp.patch, Size: 1620 bytes --]

From 22a94cf122a8f01ba8078255031cc520f4f1b70d Mon Sep 17 00:00:00 2001
From: Prafulla Giri <prafulla.giri@protonmail.com>
Date: Tue, 8 Nov 2022 13:39:21 +0545
Subject: [PATCH] guix-install.sh: remove unnecessary XDG_DATA_DIRS export.

This started out as a bug-fix for a GUI login loop that was resulting from XDG_DATA_DIRS
not including any of the host distro's directories. The solution was to export the vari-
able (with fail-safe defaults) before source-ing GUIX_PROFILE/etc/profile. It turns out
changes have already been made to ensure that XDG_DATA_DIRS, etc. are always exported
before anything guix-specific. So, this export is no longer necessary.

For reference, the aforementioned bug was found on a Debian 11 machine and it's guix.sh
init profile for guix version 1.2.
---
 etc/guix-install.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index c8ef59d4a4..21253f538b 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -10,6 +10,7 @@
 # Copyright © 2021 Jakub Kądziołka <kuba@kadziolka.net>
 # Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
 # Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+# Copyright © 2019, 2020, 2022 Prafulla Giri <prafulla.giri@protonmail.com>
 #
 # This file is part of GNU Guix.
 #
@@ -535,9 +536,6 @@ GUIX_LOCPATH="$GUIX_PROFILE/lib/locale"
 export GUIX_LOCPATH
 
 [ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile"
-
-# set XDG_DATA_DIRS to include Guix installations
-export XDG_DATA_DIRS="$GUIX_PROFILE/share:$XDG_DATA_DIRS"
 EOF
 }
 
-- 
2.38.0

bug#59127: [PATCH] guix-install.sh: remove unnecessary XDG_DATA_DIRS export.

[宋文武 via Guix-patches via]

Prafulla Giri <prafulla.giri@protonmail.com> writes:

> Hello there,
>
> Here's a small patch.
>
> Regards.
>
> From 22a94cf122a8f01ba8078255031cc520f4f1b70d Mon Sep 17 00:00:00 2001
> From: Prafulla Giri <prafulla.giri@protonmail.com>
> Date: Tue, 8 Nov 2022 13:39:21 +0545
> Subject: [PATCH] guix-install.sh: remove unnecessary XDG_DATA_DIRS export.
>
> This started out as a bug-fix for a GUI login loop that was resulting from XDG_DATA_DIRS
> not including any of the host distro's directories. The solution was to export the vari-
> able (with fail-safe defaults) before source-ing GUIX_PROFILE/etc/profile. It turns out
> changes have already been made to ensure that XDG_DATA_DIRS, etc. are always exported
> before anything guix-specific. So, this export is no longer necessary.
>
> For reference, the aforementioned bug was found on a Debian 11 machine and it's guix.sh
> init profile for guix version 1.2.
> ---
>  etc/guix-install.sh | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/etc/guix-install.sh b/etc/guix-install.sh
> index c8ef59d4a4..21253f538b 100755
> --- a/etc/guix-install.sh
> +++ b/etc/guix-install.sh
> @@ -10,6 +10,7 @@
>  # Copyright © 2021 Jakub Kądziołka <kuba@kadziolka.net>
>  # Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
>  # Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
> +# Copyright © 2019, 2020, 2022 Prafulla Giri <prafulla.giri@protonmail.com>

I changed copyright years to only '2022'.

Pushed, thank you!

[bug#59127] [PATCH] guix-install.sh: remove unnecessary XDG_DATA_DIRS export.

[Prafulla Giri via Guix-patches via]

Thank you.

The copyright year was because I introduced the guix.sh init profile back in 2019 but had not put the copyright year in (https://git.savannah.gnu.org/cgit/guix.git/log/?qt=author&q=Prafulla+Giri). But that's all right. (Turns out the first patch was committed in 2020 - authored in 2019 - so it was wrong anyways)

Cheers!

------- Original Message -------
On Monday, November 14th, 2022 at 8:12 AM, 宋文武 <iyzsong@envs.net> wrote:


> Prafulla Giri prafulla.giri@protonmail.com writes:
> 
> > Hello there,
> > 
> > Here's a small patch.
> > 
> > Regards.
> > 
> > From 22a94cf122a8f01ba8078255031cc520f4f1b70d Mon Sep 17 00:00:00 2001
> > From: Prafulla Giri prafulla.giri@protonmail.com
> > Date: Tue, 8 Nov 2022 13:39:21 +0545
> > Subject: [PATCH] guix-install.sh: remove unnecessary XDG_DATA_DIRS export.
> > 
> > This started out as a bug-fix for a GUI login loop that was resulting from XDG_DATA_DIRS
> > not including any of the host distro's directories. The solution was to export the vari-
> > able (with fail-safe defaults) before source-ing GUIX_PROFILE/etc/profile. It turns out
> > changes have already been made to ensure that XDG_DATA_DIRS, etc. are always exported
> > before anything guix-specific. So, this export is no longer necessary.
> > 
> > For reference, the aforementioned bug was found on a Debian 11 machine and it's guix.sh
> > init profile for guix version 1.2.
> > ---
> > etc/guix-install.sh | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> > 
> > diff --git a/etc/guix-install.sh b/etc/guix-install.sh
> > index c8ef59d4a4..21253f538b 100755
> > --- a/etc/guix-install.sh
> > +++ b/etc/guix-install.sh
> > @@ -10,6 +10,7 @@
> > # Copyright © 2021 Jakub Kądziołka kuba@kadziolka.net
> > # Copyright © 2021 Chris Marusich cmmarusich@gmail.com
> > # Copyright © 2021, 2022 Maxim Cournoyer maxim.cournoyer@gmail.com
> > +# Copyright © 2019, 2020, 2022 Prafulla Giri prafulla.giri@protonmail.com
> 
> 
> I changed copyright years to only '2022'.
> 
> Pushed, thank you!