diff mbox series

[bug#39231] guix-install.sh: Correctly treat empty or unset $XDG_DATA_DIRS

Message ID 20200121230133.12958-1-krotov@iitp.ru
State Accepted
Headers show
Series [bug#39231] guix-install.sh: Correctly treat empty or unset $XDG_DATA_DIRS | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job

Commit Message

Alexander Krotov Jan. 21, 2020, 11:01 p.m. UTC 
If $XDG_DATA_DIRS is unset, default value of "/usr/local/share:/usr/share"
is used according to XDG Base Directory Specification. However,
/etc/profile.d/guix.sh treats this value as empty list when appending its
own directory, so after installing Guix on the system, launchers such
as Rofi stop searching for .desktop files in /usr/share/applications/
and can't launch applications other than those installed with Guix.

This patch fixes the bug in generated /etc/profile.d/guix.sh

* etc/guix-install.sh (sys_create_init_profile): Use default value of
  /usr/local/share:/usr/share/ before appending if $XDG_DATA_DIRS is not
  set.
---
 etc/guix-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ludovic Courtès Jan. 26, 2020, 10:20 p.m. UTC | #1 
Hi,

Alexander Krotov <krotov@iitp.ru> skribis:

> If $XDG_DATA_DIRS is unset, default value of "/usr/local/share:/usr/share"
> is used according to XDG Base Directory Specification. However,
> /etc/profile.d/guix.sh treats this value as empty list when appending its
> own directory, so after installing Guix on the system, launchers such
> as Rofi stop searching for .desktop files in /usr/share/applications/
> and can't launch applications other than those installed with Guix.
>
> This patch fixes the bug in generated /etc/profile.d/guix.sh
>
> * etc/guix-install.sh (sys_create_init_profile): Use default value of
>   /usr/local/share:/usr/share/ before appending if $XDG_DATA_DIRS is not
>   set.

Good catch.  Applied, thanks!

Ludo’.
diff mbox series

Patch

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index b57d71981f..da781d41ff 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -409,7 +409,7 @@  export GUIX_PROFILE GUIX_LOCPATH
 eval `guix package --search-paths=prefix 2> /dev/null`
 
 # set XDG_DATA_DIRS to include Guix installations
-export XDG_DATA_DIRS="$GUIX_PROFILE/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS"
+export XDG_DATA_DIRS="$GUIX_PROFILE/share:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}"
 EOF
 }