⛏️ index : haiku.git

0841580ae78db3da98beedca5fe6569a7dd77703 [patch]

d01050c3cfb09007d8273cb8656ce7beaa15f196

950b6b08e72193178e77307ff8f5c53389cdff79

0841580ae78db3da98beedca5fe6569a7dd77703.tar.gz

env vars: move XDG Base Dirs variable exports to SetupEnvironment

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>
(cherry picked from commit 3af8011358bd4c624a0979336d48dabb466171ed)
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5918
Reviewed-by: waddlesplash <waddlesplash@gmail.com>

Diff

 data/etc/profile.d/xdg_basedirs.sh | 29 -----------------------------
 data/system/boot/SetupEnvironment  | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/data/etc/profile.d/xdg_basedirs.sh b/data/etc/profile.d/xdg_basedirs.sh
deleted file mode 100755
index a546398..0000000 100755
--- a/data/etc/profile.d/xdg_basedirs.sh
+++ /dev/null
@@ -1,29 +1,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"
diff --git a/data/system/boot/SetupEnvironment b/data/system/boot/SetupEnvironment
index 3ad10f4..e43659e 100644
--- a/data/system/boot/SetupEnvironment
+++ b/data/system/boot/SetupEnvironment
@@ -53,3 +53,33 @@

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"