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.

Sign up for GitHub

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

Install EOS overlay by default #3356

Merged
merged 12 commits into from
Jan 7, 2024
Merged

Install EOS overlay by default #3356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d8d8fe1
Install EOS overlay by default
Etaash-mathamsetty Dec 27, 2023
1d638e5
remove isInstalled export and replace with getStatus
Etaash-mathamsetty Dec 27, 2023
99629c2
fix circular dependencies
Etaash-mathamsetty Dec 28, 2023
61e4f9d
bugfix
Etaash-mathamsetty Dec 28, 2023
98db44a
stop checking if overlay is enabled
Etaash-mathamsetty Dec 28, 2023
63dd06d
Revert "stop checking if overlay is enabled"
Etaash-mathamsetty Dec 28, 2023
51e4b64
Merge remote-tracking branch 'upstream/main' into overlay-default
Etaash-mathamsetty Jan 6, 2024
89cf82e
use seperate functions
Etaash-mathamsetty Jan 6, 2024
9b4387f
Merge remote-tracking branch 'upstream/main' into overlay-default
Etaash-mathamsetty Jan 6, 2024
5be3e17
Merge remote-tracking branch 'upstream/main' into overlay-default
Etaash-mathamsetty Jan 6, 2024
1b495be
Merge remote-tracking branch 'upstream/main' into overlay-default
Etaash-mathamsetty Jan 6, 2024
efa1a65
Update eos_overlay.ts
Etaash-mathamsetty Jan 6, 2024
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
6 changes: 3 additions & 3 deletions src/backend/storeManagers/legendary/eos_overlay/eos_overlay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function getStatus(): {
readFileSync(installedVersionPath(), 'utf-8')
)

if (install_path !== defaultInstallPath) {
if (install_path !== defaultInstallPath()) {
logWarning(
'EOS Overlay is not installed in default location, permission issues might arise',
LogPrefix.Legendary
Expand Down Expand Up @@ -98,7 +98,7 @@ async function install() {
{
subcommand: 'eos-overlay',
action: 'install',
'--path': Path.parse(defaultInstallPath)
'--path': Path.parse(defaultInstallPath())
},
{
abortId: eosOverlayAppName,
Expand All @@ -124,7 +124,7 @@ async function install() {
'-y': true,
subcommand: 'eos-overlay',
action: 'install',
'--path': Path.parse(defaultInstallPath)
'--path': Path.parse(defaultInstallPath())
},
{
abortId: eosOverlayAppName,
Expand Down
7 changes: 7 additions & 0 deletions src/backend/storeManagers/legendary/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { join } from 'path'
import { getGameInfo, runWineCommandOnGame } from './games'
import { getInstallInfo } from './library'
import { sendGameStatusUpdate } from 'backend/utils'
import { enable, getStatus, isEnabled } from './eos_overlay/eos_overlay'
import { split } from 'shlex'
import { logError } from 'backend/logger/logger'

Expand Down Expand Up @@ -56,4 +57,10 @@ export const legendarySetup = async (appName: string) => {
logError(`getInstallInfo failed with ${error}`)
}
}

const isOverlayEnabled = await isEnabled(appName)

if (getStatus().isInstalled && !isOverlayEnabled) {
await enable(appName)
}
}