Skip to content
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.

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

Fix autostart file symlink #77

Merged
merged 11 commits into from
Jul 25, 2023
Merged

Fix autostart file symlink #77

merged 11 commits into from
Jul 25, 2023

Conversation

lenemter
Copy link
Member

@lenemter lenemter commented Jul 24, 2023

Fixes #76

Closes #75

@lenemter lenemter added the Priority: High To be addressed after any critical issues label Jul 24, 2023
@lenemter lenemter requested a review from a team July 24, 2023 17:48
@lenemter lenemter mentioned this pull request Jul 24, 2023
@Marukesu
Copy link
Contributor

you could upper the minimum meson version to 0.61 and use install_symlink().

an apt show meson gives me o.61.2, so that won't be a problem for elementary.

@danirabbit
Copy link
Member

Probably should also incorporate #75 while here?

@lenemter
Copy link
Member Author

lenemter commented Jul 24, 2023

Probably should also incorporate #75 while here?

I think this PR does the exact same thing as #75 except checking is_absolute, which is false in both elementary OS and NixOS.

data/meson.build Outdated Show resolved Hide resolved
@lenemter
Copy link
Member Author

@Marukesu with install_symlink the stable and unstable CI fail. Any idea why?

@Marukesu
Copy link
Contributor

Marukesu commented Jul 24, 2023

it's seems we are triggering mesonbuild/meson#10176, the fix is present in 0.61.5.

@bobby285271
Copy link
Member

bobby285271 commented Jul 25, 2023

I think this PR does the exact same thing as #75 except checking is_absolute, which is false in both elementary OS and NixOS.

According to docs, when the prefix is /usr, sysconfdir defaults to /etc, I think in this case is_absolute is true, and in other case sysconfdir defaults to etc, in this case is_absolute is false... Though I expect the check is only needed when using the custom install script (yes, this PR works fine for me, though we still need #74).

@lenemter
Copy link
Member Author

@bobby285271 Thanks for clarification, I added changes from #75 here.

meson.build Outdated Show resolved Hide resolved
@lenemter
Copy link
Member Author

Double checked and autostart file is correctly installed.

@lenemter lenemter merged commit 15422ab into master Jul 25, 2023
4 checks passed
@lenemter lenemter deleted the fix-autostart branch July 25, 2023 04:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Priority: High To be addressed after any critical issues
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Auto switch to dark theme stopped working
4 participants