fix: use data folder on portable app Eugeny#9243

Clem-Fern · Nov 18, 2023 · ae21878 · ae21878
1 parent 3d83bc6
commit ae21878
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/app/lib/index.ts b/app/lib/index.ts
@@ -1,13 +1,16 @@
 import { app, ipcMain, Menu, dialog } from 'electron'
 
+// Portable verison: set userData path
+import './portable'
+
 // set defaults of environment variables
 import 'dotenv/config'
 process.env.TABBY_PLUGINS ??= ''
 process.env.TABBY_CONFIG_DIRECTORY ??= app.getPath('userData')
 
 
 import 'v8-compile-cache'
-import './portable'
+
 import 'source-map-support/register'
 import './sentry'
 import './lru'

diff --git a/app/lib/portable.ts b/app/lib/portable.ts
@@ -2,10 +2,11 @@ import * as path from 'path'
 import * as fs from 'fs'
 import * as electron from 'electron'
 
-const appPath = path.dirname(electron.app.getPath('exe'))
-
-const portableData = path.join(appPath, 'data')
-if (fs.existsSync(portableData)) {
-    console.log('reset user data to ' + portableData)
-    electron.app.setPath('userData', portableData)
+const isPortable = !!process.env.PORTABLE_EXECUTABLE_FILE
+if (isPortable) {
+    const portableData = path.join(process.env.PORTABLE_EXECUTABLE_DIR, 'data')
+    if (fs.existsSync(portableData)) {
+        console.log('reset user data to ' + portableData)
+        electron.app.setPath('userData', portableData)
+    }
 }