From be3ba265c29f208c6063f9597fa2259f8e560e3b Mon Sep 17 00:00:00 2001
From: Kévin Le Gouguec <kevin.legouguec@gmail.com>
Date: Sat, 16 Mar 2024 15:46:53 +0100
Subject: Fix app activation when XDG_DATA_DIRS is unset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

That else branch broke session startup on my Debian laptop.  Guessing
this is related to:

> If $XDG_DATA_DIRS is either not set or empty, a value equal to
> /usr/local/share/:/usr/share/ should be used.
— XDG Base Directory Specification

Oops.
---
 guides/setups/operating-systems/apps-demo/activate | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'guides')

diff --git a/guides/setups/operating-systems/apps-demo/activate b/guides/setups/operating-systems/apps-demo/activate
index fbf522c..b8c9138 100644
--- a/guides/setups/operating-systems/apps-demo/activate
+++ b/guides/setups/operating-systems/apps-demo/activate
@@ -31,11 +31,4 @@ _apps_XDG_DATA_DIRS=$(
     ))
     IFS=: eval 'echo "${datadirs[*]}"'
 )
-export XDG_DATA_DIRS=$(
-    if test "${XDG_DATA_DIRS}"
-    then
-        echo "${_apps_XDG_DATA_DIRS}:${XDG_DATA_DIRS}"
-    else
-        echo "${_apps_XDG_DATA_DIRS}"
-    fi
-)
+export XDG_DATA_DIRS="${_apps_XDG_DATA_DIRS}:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
-- 
cgit v1.2.3