Skip to content

fix: missing XDG_DATA_DIRS environment variables #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Jun 14, 2022
Merged

fix: missing XDG_DATA_DIRS environment variables #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions misc/Xsession.d/00deepin-dde-env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash

if [ "$1" = "/usr/bin/startdde" ]; then
if [ -f "$HOME/.dde_env" ]; then
. "$HOME/.dde_env"
Expand Down Expand Up @@ -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
4 changes: 0 additions & 4 deletions misc/profile.d/deepin-xdg-dir.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down