Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2024-11-23 07:18:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

env vars: move XDG Base Dirs variable exports to SetupEnvironment

Browse Source 
This makes sure that apps get access to these variables regardless if
they are started from a shell or from GUI (double-click from Tracker,
desklink, etc).

Fixes #18130.

Change-Id: I82e2884e460fad7d6ec16e7b624c5cd2fcf807df
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5897
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: Adrien Destugues <pulkomandy@pulkomandy.tk>
This commit is contained in:
Oscar Lesta 2022-12-11 13:01:03 -03:00 committed by waddlesplash
parent 36fa4b7e7d
commit 3af8011358
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
data/etc/profile.d/xdg_basedirs.sh
View File

@ -1,29 +0,0 @@
#
# Haiku setup for
# XDG Base Directory Specification
#
# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
# defaults to ~/.config
export XDG_CONFIG_HOME="`finddir B_USER_SETTINGS_DIRECTORY`"
# defaults to ~/.local/share
export XDG_DATA_HOME="`finddir B_USER_NONPACKAGED_DATA_DIRECTORY`"
# defaults to /etc/xdg
export XDG_CONFIG_DIRS="`finddir B_SYSTEM_SETTINGS_DIRECTORY`"
# XXX: Should we add B_USER_ETC_DIRECTORY?
# default to /usr/local/share/:/usr/share/
export XDG_DATA_DIRS="`finddir B_SYSTEM_NONPACKAGED_DATA_DIRECTORY`:\
`finddir B_SYSTEM_DATA_DIRECTORY`"
# defaults to ~/.cache
export XDG_CACHE_HOME="`finddir B_USER_CACHE_DIRECTORY`"
# TODO:
# This one is used for session stuff (sockets, pipes...)
# It must be owned by the user, with permissions 0700.
# It is supposed to be cleaned up on last log-out.
# Apps will fall back to /tmp usually anyway.
#export XDG_RUNTIME_DIR="`finddir B_USER_VAR_DIRECTORY`/tmp"

30
data/system/boot/SetupEnvironment
View File

@ -53,3 +53,33 @@ fi
export USER=`id -un`
export GROUP=`id -gn`
#
# Haiku setup for
# XDG Base Directory Specification
#
# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
# defaults to ~/.config
export XDG_CONFIG_HOME="`finddir B_USER_SETTINGS_DIRECTORY`"
# defaults to ~/.local/share
export XDG_DATA_HOME="`finddir B_USER_NONPACKAGED_DATA_DIRECTORY`"
# defaults to /etc/xdg
export XDG_CONFIG_DIRS="`finddir B_SYSTEM_SETTINGS_DIRECTORY`"
# XXX: Should we add B_USER_ETC_DIRECTORY?
# default to /usr/local/share/:/usr/share/
export XDG_DATA_DIRS="`finddir B_SYSTEM_NONPACKAGED_DATA_DIRECTORY`:\
`finddir B_SYSTEM_DATA_DIRECTORY`"
# defaults to ~/.cache
export XDG_CACHE_HOME="`finddir B_USER_CACHE_DIRECTORY`"
# TODO:
# This one is used for session stuff (sockets, pipes...)
# It must be owned by the user, with permissions 0700.
# It is supposed to be cleaned up on last log-out.
# Apps will fall back to /tmp usually anyway.
#export XDG_RUNTIME_DIR="`finddir B_USER_VAR_DIRECTORY`/tmp"