From f7501dfd6741d1f5e7d9cad92f832d3ea5230470 Mon Sep 17 00:00:00 2001
From: Luna <30698906+Lunarequest@users.noreply.github.com>
Date: Thu, 30 Sep 2021 21:27:13 +0530
Subject: [PATCH] Flatpak: locate and launch flatpaked code editors (#602)

---
 app/src/lib/helpers/linux.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/lib/helpers/linux.ts b/app/src/lib/helpers/linux.ts
index aac3701dd95..2355ddf82da 100644
--- a/app/src/lib/helpers/linux.ts
+++ b/app/src/lib/helpers/linux.ts
@@ -21,7 +21,7 @@ export function convertToFlatpakPath(path: string) {
     return path
   }
 
-  if (path.startsWith('/opt/')) {
+  if (path.startsWith('/opt/') || path.startsWith('/var/lib/flatpak')) {
     return path
   }
 
@@ -32,6 +32,12 @@ 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
  *
@@ -85,11 +91,12 @@ export function spawnEditor(
   options: SpawnOptions
 ): ChildProcess {
   if (isFlatpakBuild()) {
+    const actualPath = formatPathForFlatpak(path)
     const EscapedworkingDirectory =
       formatWorkingDirectoryForFlatpak(workingDirectory)
     return nodeSpawn(
       'flatpak-spawn',
-      ['--host', path, EscapedworkingDirectory],
+      ['--host', actualPath, EscapedworkingDirectory],
       options
     )
   } else {