Skip to content

Fix resolution of program root #4956

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

Merged
merged 1 commit into from
Mar 21, 2022
Merged

Fix resolution of program root #4956

merged 1 commit into from
Mar 21, 2022

Conversation

jtanx
Copy link
Contributor

@jtanx jtanx commented Mar 20, 2022

From #4827, the app bundle's entrypoint is now a symlink to the real binary instead of a startup script, which throws off the resolution of the program root.

This fix checks to see if the determined root is valid, and if not, tries to resolve symlinks. Similar to #4626 but preserves existing behaviour if everything else is also symlinked properly.

Type of change

  • Bug fix

Fixes #4953

@lgtm-com
Copy link

lgtm-com bot commented Mar 20, 2022

This pull request fixes 1 alert when merging a45dad0 into dfb7830 - view on LGTM.com

fixed alerts:

  • 1 for Local variable hides global variable

Copy link
Contributor

@skef skef left a comment

Choose a reason for hiding this comment

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

I feel like you would lecture me about the added statics but I ain't got no problem with 'em. LGTM.

@jtanx
Copy link
Contributor Author

jtanx commented Mar 21, 2022

If you're referring to the statics in fsys.c, I'm pretty sure I reduced the net amount

@jtanx jtanx merged commit 9c76cf9 into fontforge:master Mar 21, 2022
@jtanx jtanx deleted the gf branch March 21, 2022 07:45
@skef
Copy link
Contributor

skef commented Apr 3, 2022

@jtanx you might not have meant to leave the TRACE in fsys.c in this uncommented.

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.

Some menu not working on MAC
2 participants