Skip to content
This repository was archived by the owner on Aug 19, 2024. It is now read-only.

Chore: Updated prerequisite to check Win Store version #96

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Chore: Updated prerequisite to check Win Store version #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d21a24a
Merge branch 'master' of https://github.com/EtherealEngine/etherealen…
Abhijay007 May 20, 2023
c8052bf
Merge branch 'master' of https://github.com/EtherealEngine/etherealen…
Abhijay007 May 22, 2023
76cf708
Merge branch 'master' of https://github.com/EtherealEngine/etherealen…
Abhijay007 Jun 3, 2023
977fe02
Chore: Updated prerequsite to check Win Store ver
Abhijay007 Jun 3, 2023
0b3154d
Merge branch 'master' of https://github.com/EtherealEngine/etherealen…
Abhijay007 Jun 14, 2023
3eabdb4
Chore : resolved requested changes
Abhijay007 Jun 15, 2023
ff17f22
Merge branch 'master' into Abhijay007/update-prerequisite
hanzlamateen Aug 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/handlers/Utilities/Prerequisites.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { AppModel, getAppModel } from '../../../models/AppStatus'
export const WindowsPrerequisites: AppModel[] = [
getAppModel('wsl', 'Windows Subsystem for Linux (WSL)', 'wsl --status;', false),
getAppModel('wslUbuntu', 'WSL Ubuntu Distribution', 'wsl --status;', false),
getAppModel('wslUbuntuStore', 'Ubuntu from Windows Store', 'Get-service wslservice;', false),
getAppModel('dockerDesktop', 'Docker Desktop', 'docker version;', false),
getAppModel('dockerDesktopUbuntu', 'Docker Desktop WSL Ubuntu Integration', 'wsl docker version;', false)
]
5 changes: 3 additions & 2 deletions src/main/handlers/Utilities/Utilities.class.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class Utilities {
return WindowsPrerequisites
}
} catch (err) {
log.error('Failed to get pre requisites.', err)
log.error('Failed to get prerequisites.', err)
}

return []
Expand All @@ -120,7 +120,7 @@ class Utilities {

if (error || stderr) {
log.error(
`Error while executing check ${prerequisite.name} command: ${prerequisite.checkCommand}.`,
`Error while executing the check ${prerequisite.name} command: ${prerequisite.checkCommand}.`,
error,
stderr
)
Expand All @@ -129,6 +129,7 @@ class Utilities {
if (
(prerequisite.id === 'wsl' && stdOutput) ||
(prerequisite.id === 'wslUbuntu' && stdOutput.includes(': Ubuntu')) ||
(prerequisite.id === 'wslUbuntuStore' && stdOutput) ||
((prerequisite.id === 'dockerDesktop' || prerequisite.id === 'dockerDesktopUbuntu') &&
stdOutput.includes('Server: Docker Desktop'))
) {
Expand Down
11 changes: 10 additions & 1 deletion src/renderer/components/Config/PrereqsView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const PrereqsView = ({ sx }: Props) => {
}

const processDescriptions = (status: AppModel) => {
if (status.id === 'wsl' || status.id === 'wslUbuntu') {
if (status.id === 'wsl' || status.id === 'wslUbuntu' || status.id === 'wslUbuntuStore') {
status.description = (
<Typography fontSize={14}>
<span style={{ fontSize: 14, opacity: 0.6 }}>
Expand Down Expand Up @@ -83,6 +83,15 @@ const PrereqsView = ({ sx }: Props) => {
<br />
<code>wsl -s Ubuntu</code>
</>
)}{' '}
{status.id === 'wslUbuntuStore' && (
<>
<br />
<br />
<span style={{ fontSize: 14, opacity: 0.6 }}>
To install the Ubuntu distribution from the Windows Store, you can refer to docs above
</span>
</>
)}
</Typography>
)
Expand Down