Skip to content

fix: export desktop to a invalid export path#1200

Merged
reddevillg merged 1 commit into
OpenAtom-Linyaps:masterfrom
dengbo11:fix-export
Jun 4, 2025
Merged

fix: export desktop to a invalid export path#1200
reddevillg merged 1 commit into
OpenAtom-Linyaps:masterfrom
dengbo11:fix-export

Conversation

@dengbo11

@dengbo11 dengbo11 commented Jun 3, 2025

Copy link
Copy Markdown
Collaborator
  1. The custom desktop exported directory(CUSTOM_DESKTOP_DATA_DIR) should only be in the share dir, not in the subdirectory;
  2. LINGLONG_DATA_DIR should be exported;
  3. need to update LINGLONG_EXPORT_VERSION to fix export.

@dengbo11 dengbo11 requested review from ice909 and myml June 3, 2025 08:55
@dengbo11 dengbo11 force-pushed the fix-export branch 2 times, most recently from e5e3cac to b88d161 Compare June 3, 2025 11:41
@ice909 ice909 requested a review from Copilot June 3, 2025 13:49

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR refactors how XDG_DATA_DIRS paths are normalized and added—introducing a helper function—and bumps the export version.

  • Normalize and sanitize LINGLONG_DESKTOP_EXPORT_PATH, LINGLONG_DATA_DIR, and CUSTOM_DESKTOP_DATA_DIR
  • Introduce _add_path_to_xdg_data_dirs helper to safely prepend or append paths
  • Ensure LINGLONG_DATA_DIR is always exported and bump LINGLONG_EXPORT_VERSION to 1.0.0.2

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
misc/lib/linglong/generate-xdg-data-dirs.sh Add path-normalization logic and helper function
libs/utils/src/linglong/utils/configure.h.in Update LINGLONG_EXPORT_VERSION from 1.0.0.1 to 1.0.0.2
Comments suppressed due to low confidence (2)

misc/lib/linglong/generate-xdg-data-dirs.sh:11

  • This comment refers only to appending, but the new helper supports both prepend and append. Consider updating it to explain the helper’s full capabilities.
# instead of prepending it like flatpak.

misc/lib/linglong/generate-xdg-data-dirs.sh:55

  • [nitpick] The closing fi is indented by two spaces, which is inconsistent with other if…fi blocks in this script. Align it with its if for clearer structure.
  fi

ice909
ice909 previously approved these changes Jun 3, 2025
1. The custom desktop exported directory(CUSTOM_DATA_DIR) should only be in the share dir, not in the subdirectory;
2. LINGLONG_DATA_DIR should be exported;
3. need to update LINGLONG_EXPORT_VERSION to fix export.
@reddevillg reddevillg merged commit 286d413 into OpenAtom-Linyaps:master Jun 4, 2025
5 of 13 checks passed
@dengbo11 dengbo11 deleted the fix-export branch July 1, 2026 05:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants