Skip to content

fix run-start.sh: if running in docker-container, just start electron…#1861

Merged
MichMich merged 1 commit intoMagicMirrorOrg:developfrom
khassel:develop
Jan 8, 2020
Merged

fix run-start.sh: if running in docker-container, just start electron…#1861
MichMich merged 1 commit intoMagicMirrorOrg:developfrom
khassel:develop

Conversation

@khassel
Copy link
Collaborator

@khassel khassel commented Jan 3, 2020

Fixes #1859

With this fix the run-start.sh script differentiate if running in a docker-container or not:

  • running inside a docker-container: Just start electron
  • running not in a docker-container: Do things as before

@MichMich
Copy link
Collaborator

MichMich commented Jan 3, 2020

@sdetweil What are your thoughts on this PR?

@sdetweil
Copy link
Collaborator

sdetweil commented Jan 4, 2020

I would have captured the result of the grep and added it to the other decision tree choices, and launched electron at the end like it does, rather than add another launch

my old training is don't duplicate

@khassel
Copy link
Collaborator Author

khassel commented Jan 4, 2020

I would have captured the result of the grep and added it to the other decision tree choices, and launched electron at the end like it does, rather than add another launch

my old training is don't duplicate

thought about this solution first, but decided against. So the first if is a decision between docker or nodocker and your part is untouched in the nodocker-section. The duplicate is one row.

And this fix is only needed until #1860 is implemented.

But if it is consensus here i can change it.

@MichMich
Copy link
Collaborator

MichMich commented Jan 8, 2020

I'll merge it for now, but chances are that the script is removed in the next version. Thanks for your contribution.

@MichMich MichMich merged commit 0afe403 into MagicMirrorOrg:develop Jan 8, 2020
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.

3 participants