summarylogtreecommitdiffstats
path: root/fix-argv.diff
blob: 8194d3ab15dc6f877997fe80f3719a8da33ce15f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
diff --git a/apps/studio/src/common/platform_info/mainPlatformInfo.ts b/apps/studio/src/common/platform_info/mainPlatformInfo.ts
index beaed500..ece118be 100644
--- a/apps/studio/src/common/platform_info/mainPlatformInfo.ts
+++ b/apps/studio/src/common/platform_info/mainPlatformInfo.ts
@@ -49,7 +49,7 @@ export function mainPlatformInfo(): IPlatformInfo {
 
   const oracleSupported = isMac && isArm ? false : true
 
-  const resourcesPath = isDevEnv ? resolve('./extra_resources') : resolve(p.resourcesPath)
+  const resourcesPath = testMode ? resolve(p.resourcesPath) : (isDevEnv ? resolve('./extra_resources') : join('/usr/lib', e.app.getName()))
   let userDirectory = testMode ? './tmp' : e.app.getPath("userData")
   const downloadsDirectory = testMode ? './tmp' : e.app.getPath('downloads')
   const homeDirectory = testMode ? './tmp' : e.app.getPath('home')
@@ -59,7 +59,19 @@ export function mainPlatformInfo(): IPlatformInfo {
 
   const sessionType = p.env.XDG_SESSION_TYPE
 
-  const slice = isDevEnv ? 2 : 1
+  let slice = 0
+
+  if (isDevEnv) {
+    slice = 2
+  } else {
+    for (const arg of p.argv) {
+      slice++
+      if (arg.includes('app.asar') === true) {
+        break
+      }
+    }
+  }
+
   const parsedArgs = yargs(p.argv.slice(slice))
   const appVersion = testMode ? '0.0.0' : e.app.getVersion()