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: mac support #301

Merged
merged 2 commits into from Mar 10, 2022
Merged

Conversation

LindirQuenya
Copy link
Member

@LindirQuenya LindirQuenya commented Feb 5, 2022

This PR fixes four issues that affected MacOS builds.

  1. state.mainFolderPath (and hence configFolder, too) was being set to DIR/Flashpoint.app/Contents/MacOS, rather than DIR. ([BUG] MacOS: Launcher cannot load its own config and preferences #296)
  2. The launcher.log was being placed in DIR/Flashpoint.app/Contents/MacOS, rather than DIR.
  3. state.config.flashpointPath was interpreted as relative to the current working directory, which is set to / by Finder. This was fixed by interpreting a relative flashpointPath as relative to the configFolder, not relative to the current working directory.
  4. The path for the lang jsons was defaulting to DIR/Flashpoint.app/Contents/MacOS/lang, instead of DIR/Flashpoint.app/Contents/lang.

All of the fixes only take effect when on Mac, so they shouldn't break any other platforms.

@coveralls
Copy link

Pull Request Test Coverage Report for Build 1800548919

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.1%) to 60.163%

Totals Coverage Status
Change from base Build 1766549299: -0.1%
Covered Lines: 360
Relevant Lines: 548

💛 - Coveralls

@colin969 colin969 merged commit a146628 into FlashpointProject:develop Mar 10, 2022
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.

None yet

3 participants