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

Try to fix macOS not launching CX #1392

Merged
merged 4 commits into from
May 28, 2022

Conversation

CommandMC
Copy link
Collaborator


Use the following Checklist if you have changed something on the Backend or Frontend:

  • Tested the feature and it's working on a current and clean install.
  • Tested the main App features and they are still working on a current and clean install. (Login, Install, Play, Uninstall, Move games, etc.)
  • Created / Updated Tests (If necessary)
  • Created / Updated documentation (If necessary)

@CommandMC CommandMC added pr:wip WIP, don't merge. pr:testing This PR is in testing, don't merge. labels May 28, 2022
@flavioislima
Copy link
Member

Did you confirm that this is still an issue on macOS?
I will do some tests disabling the shell again to see if it will break.

@CommandMC
Copy link
Collaborator Author

There are a bunch of people in the macOS channel having this issue, so I'd assume that it's still present
Sadly I nuked my macOS VM yesterday by accident, will need some time to get that setup again to test

@flavioislima
Copy link
Member

I mean, I am testing here by using the shell on mac again to try to reproduce the first issue we had.
Because after that we had several refactors that might could have fixed the issue.

@flavioislima
Copy link
Member

flavioislima commented May 28, 2022

So far, removing the shell: isMac when running the command and this works:

  • Install Epic game
  • Install GOG game
  • play windows games
  • play native games
  • play windows version of native games
  • update a game (could test only on GOGDL since I don't have games to update on epic) is broken, even with latest test version of gogdl. But the command is being called so heroic is doing its part.
  • Uninstall a game
  • Login on both platforms

So I believe it is 100% safe to remove the shell on macOS now. Could not find one single issue with the command call.

@CommandMC
Copy link
Collaborator Author

Alright, shell's removed now

With the last commit, I believe I've also fixed a bug: When you had an environment variable defined in both your process's env (so for example in .bashrc) and in Heroic's Settings, the process one would override Heroic's settings. That's now the other way around, which I think makes more sense

Copy link
Member

@flavioislima flavioislima left a comment

Choose a reason for hiding this comment

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

Looks good! 👍🏽

@flavioislima
Copy link
Member

Alright, shell's removed now

With the last commit, I believe I've also fixed a bug: When you had an environment variable defined in both your process's env (so for example in .bashrc) and in Heroic's Settings, the process one would override Heroic's settings. That's now the other way around, which I think makes more sense

yes, exactly, the latest override the first inside an object.

@flavioislima flavioislima marked this pull request as ready for review May 28, 2022 13:56
@CommandMC CommandMC merged commit a131e0c into Heroic-Games-Launcher:main May 28, 2022
@CommandMC CommandMC deleted the fix-macos branch May 28, 2022 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr:testing This PR is in testing, don't merge. pr:wip WIP, don't merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants