Skip to content

Flatpak: locate and launch flatpaked code editors #602

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

Merged
shiftkey merged 2 commits into from
Sep 30, 2021
Merged

Flatpak: locate and launch flatpaked code editors #602

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a32633
Flatpak: locate and launch flatpaked code editors
Lunarequest Sep 21, 2021
fb85c45
fix linting
Lunarequest Sep 21, 2021
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
12 changes: 10 additions & 2 deletions app/src/lib/helpers/linux.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function convertToFlatpakPath(path: string) {
return path
}

if (path.startsWith('/opt/')) {
if (path.startsWith('/opt/') || path.startsWith('/var/lib/flatpak')) {
return path
}

Expand All @@ -31,6 +31,13 @@ export function convertToFlatpakPath(path: string) {
export function formatWorkingDirectoryForFlatpak(path: string): string {
return path.replace(/(\s)/, ' ')
}

export function formatPathForFlatpak(path: string): string {
if (path.startsWith('/var/lib/flatpak/app')) {
return path.replace('/var/lib/flatpak/app/', '')
}
return path
}
/**
* Checks the file path on disk exists before attempting to launch a specific shell
*
Expand Down Expand Up @@ -84,12 +91,13 @@ export function spawnEditor(
options: SpawnOptions
): ChildProcess {
if (isFlatpakBuild()) {
const actualpath = formatPathForFlatpak(path)
const EscapedworkingDirectory = formatWorkingDirectoryForFlatpak(
workingDirectory
)
return spawn(
'flatpak-spawn',
['--host', path, EscapedworkingDirectory],
['--host', actualpath, EscapedworkingDirectory],
options
)
} else {
Expand Down