Fix issues with executable when using portable on windows (#850)

* Fix startup executable for windows portable
* Set folder name of unpacking for windows portable exe

3 files changed, 14 insertions, 3 deletions

diff --git a/src/@types/ferdium.types.ts b/src/@types/ferdium.types.ts
index db8711cd3..70306f5fb 100644
--- a/src/@types/ferdium.types.ts
+++ b/src/@types/ferdium.types.ts
@@ -8,6 +8,7 @@ declare global {
       GITHUB_AUTH_TOKEN: string;
       NODE_ENV: 'development' | 'production';
       FERDIUM_APPDATA_DIR?: string;
+      PORTABLE_EXECUTABLE_FILE?: string;
       PORTABLE_EXECUTABLE_DIR?: string;
       ELECTRON_IS_DEV?: string;
       APPDATA?: string;
diff --git a/src/environment.ts b/src/environment.ts
index 5838f1d53..0ba7774cd 100644
--- a/src/environment.ts
+++ b/src/environment.ts
@@ -5,6 +5,7 @@ import { arch, release } from 'os';
 export const isMac = process.platform === 'darwin';
 export const isWindows = process.platform === 'win32';
 export const isLinux = process.platform === 'linux';
+export const isWinPortable = process.env.PORTABLE_EXECUTABLE_FILE != null;
 
 export const electronVersion: string = process.versions.electron ?? '';
 export const chromeVersion: string = process.versions.chrome ?? '';
diff --git a/src/stores/AppStore.ts b/src/stores/AppStore.ts
index 2db90bfa0..02d616241 100644
--- a/src/stores/AppStore.ts
+++ b/src/stores/AppStore.ts
@@ -21,7 +21,12 @@ import TypedStore from './lib/TypedStore';
 import Request from './lib/Request';
 import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
 import { cleanseJSObject } from '../jsUtils';
-import { isMac, electronVersion, osRelease } from '../environment';
+import {
+  isMac,
+  isWinPortable,
+  electronVersion,
+  osRelease,
+} from '../environment';
 import {
   ferdiumVersion,
   userDataPath,
@@ -41,7 +46,11 @@ const debug = require('../preload-safe-debug')('Ferdium:AppStore');
 
 const mainWindow = getCurrentWindow();
 
-const executablePath = isMac ? remoteProcess.execPath : process.execPath;
+const executablePath = isMac
+  ? remoteProcess.execPath
+  : isWinPortable
+  ? process.env.PORTABLE_EXECUTABLE_FILE
+  : process.execPath;
 const autoLauncher = new AutoLaunch({
   name: 'Ferdium',
   path: executablePath,
@@ -279,7 +288,7 @@ export default class AppStore extends TypedStore {
     if (isMac && !localStorage.getItem(CATALINA_NOTIFICATION_HACK_KEY)) {
       debug('Triggering macOS Catalina notification permission trigger');
       // eslint-disable-next-line no-new
-      new window.Notification('Welcome to Ferdium 5', {
+      new window.Notification('Welcome to Ferdium 6', {
         body: 'Have a wonderful day & happy messaging.',
       });