fix: export desktop to a invalid export path#1200
Merged
Merged
Conversation
dengbo11
commented
Jun 3, 2025
Collaborator
- The custom desktop exported directory(CUSTOM_DESKTOP_DATA_DIR) should only be in the share dir, not in the subdirectory;
- LINGLONG_DATA_DIR should be exported;
- need to update LINGLONG_EXPORT_VERSION to fix export.
e5e3cac to
b88d161
Compare
There was a problem hiding this comment.
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, andCUSTOM_DESKTOP_DATA_DIR - Introduce
_add_path_to_xdg_data_dirshelper to safely prepend or append paths - Ensure
LINGLONG_DATA_DIRis always exported and bumpLINGLONG_EXPORT_VERSIONto1.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
fiis indented by two spaces, which is inconsistent with otherif…fiblocks in this script. Align it with itsiffor clearer structure.
fi
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
approved these changes
Jun 4, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.