Skip to content

fix: failed to export XDG_DATA_DIRS enviroment #1220

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
dengbo11 merged 1 commit into from
Jun 16, 2025
Merged

fix: failed to export XDG_DATA_DIRS enviroment #1220

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
29 changes: 9 additions & 20 deletions misc/lib/linglong/generate-xdg-data-dirs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
LINGLONG_ROOT="@LINGLONG_ROOT@"
LINGLONG_EXPORT_PATH="@LINGLONG_EXPORT_PATH@"

# 规范化 LINGLONG_DATA_DIR：移除末尾可能存在的斜杠
LINGLONG_DATA_DIR="${LINGLONG_ROOT}/entries/share"
LINGLONG_DATA_DIR=${LINGLONG_DATA_DIR%/}

# --- 辅助函数：安全地添加路径到 XDG_DATA_DIRS ---
# 这个函数会检查路径是否已存在，如果不存在则添加。
Expand All @@ -26,21 +24,14 @@ _add_path_to_xdg_data_dirs() {
local path_to_add="${1%/}" # 确保要添加的路径没有末尾斜杠
local position="${2:-start}" # 默认添加到开头

# 确保 XDG_DATA_DIRS 变量已定义，如果未定义则初始化为空字符串
: "${XDG_DATA_DIRS:=}"

# 检查路径是否已存在于 XDG_DATA_DIRS 中
# 在 XDG_DATA_DIRS 两端加上冒号，以确保精确匹配（无论路径在开头、中间还是结尾）
if [[ ":${XDG_DATA_DIRS}:" == *":${path_to_add}:"* ]]; then
# 路径已存在，不执行任何操作
return 0
fi

# 如果路径不存在，则根据指定位置添加
if [[ -z "$XDG_DATA_DIRS" ]]; then
# 如果 XDG_DATA_DIRS 当前为空，直接赋值
XDG_DATA_DIRS="$path_to_add"
elif [[ "$position" == "start" ]]; then
if [[ "$position" == "start" ]]; then
# 添加到开头
XDG_DATA_DIRS="$path_to_add:$XDG_DATA_DIRS"
elif [[ "$position" == "end" ]]; then
Expand All @@ -49,21 +40,19 @@ _add_path_to_xdg_data_dirs() {
fi
}

# 如果 XDG_DATA_DIRS 为空，则先设置为 /usr/local/share:/usr/share
# 参考: https://specifications.freedesktop.org/basedir-spec/latest
_add_path_to_xdg_data_dirs "/usr/local/share" "end"
_add_path_to_xdg_data_dirs "/usr/share" "end"

# 将 LINGLONG_DATA_DIR 添加到 XDG_DATA_DIRS 的末尾（如果不存在）
_add_path_to_xdg_data_dirs "$LINGLONG_DATA_DIR" "end"

# 如果有自定义 LINGLONG_EXPORT_PATH(默认为 "share"),将自定义路径添加到 XDG_DATA_DIRS
if [ "$LINGLONG_EXPORT_PATH" != "share" ]; then
# 规范化 CUSTOM_DATA_DIR：移除末尾可能存在的斜杠
CUSTOM_DATA_DIR="${LINGLONG_ROOT}/entries/${LINGLONG_EXPORT_PATH}"
CUSTOM_DATA_DIR=${CUSTOM_DATA_DIR%/}
_add_path_to_xdg_data_dirs "$CUSTOM_DATA_DIR" "start"
fi

# 2. 处理 LINGLONG_DATA_DIR 的添加逻辑
# 如果 XDG_DATA_DIRS 为空，则先设置为 /usr/local/share:/usr/share，
# 然后再将 LINGLONG_DATA_DIR 添加到末尾。
: "${XDG_DATA_DIRS:=/usr/local/share:/usr/share}"

# 然后，将 LINGLONG_DATA_DIR 添加到 XDG_DATA_DIRS 的末尾（如果不存在）
_add_path_to_xdg_data_dirs "$LINGLONG_DATA_DIR" "end"

# --- 清理辅助函数 ---
unset -f _add_path_to_xdg_data_dirs