From e73ca1620787d3bf6d508bcaee37b9a0ba4b9241 Mon Sep 17 00:00:00 2001
From: justforlxz <justforlxz@gmail.com>
Date: Fri, 27 May 2022 10:08:38 +0800
Subject: [PATCH] fix: missing XDG_DATA_DIRS environment variables

set XDG_DATA_DIRS to $HOME/.local/share /usr/local/share /usr/share

Issue: Fixed https://github.com/linuxdeepin/developer-center/issues/2457
Log:
---
 misc/Xsession.d/00deepin-dde-env | 14 ++++++++++++++
 misc/profile.d/deepin-xdg-dir.sh |  4 ----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/misc/Xsession.d/00deepin-dde-env b/misc/Xsession.d/00deepin-dde-env
index 3ba1defd..31caf08a 100644
--- a/misc/Xsession.d/00deepin-dde-env
+++ b/misc/Xsession.d/00deepin-dde-env
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if [ "$1" = "/usr/bin/startdde" ]; then
     if [ -f "$HOME/.dde_env" ]; then
         . "$HOME/.dde_env"
@@ -27,4 +29,16 @@ if [ "$1" = "/usr/bin/startdde" ]; then
     if [ $? -eq 0 ];then
         export QMLSCENE_DEVICE=softwarecontext
     fi
+
+    # https://man7.org/linux/man-pages/man7/systemd.environment-generator.7.html
+    # set the default value
+    XDG_DATA_DIRS="${XDG_DATA_DIRS:-/usr/local/share/:/usr/share}"
+
+    if [[ -d $HOME/.local/share/icons/ ]];
+    then
+        export XDG_DATA_DIRS="$HOME/.local/share/icons/:${XDG_DATA_DIRS}"
+    fi
+    export XDG_DATA_HOME="$HOME/.local/share"
+    export XDG_CONFIG_HOME="$HOME/.config"
+    export XDG_CACHE_HOME="$HOME/.cache"
 fi
diff --git a/misc/profile.d/deepin-xdg-dir.sh b/misc/profile.d/deepin-xdg-dir.sh
index d47eda03..621ae125 100644
--- a/misc/profile.d/deepin-xdg-dir.sh
+++ b/misc/profile.d/deepin-xdg-dir.sh
@@ -1,7 +1,3 @@
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_CACHE_HOME="$HOME/.cache"
-
 #export XDG_DESKTOP_DIR="$HOME/Desktop"
 #export XDG_DOCUMENTS_DIR="$HOME/Documents"
 #export XDG_DOWNLOAD_DIR="$HOME/Downloads"