2 files changed, 14 insertions, 8 deletions

diff --git a/@types/index.d.ts b/@types/index.d.ts
index e21f88cee..4bfdb28fc 100644
--- a/@types/index.d.ts
+++ b/@types/index.d.ts
@@ -2,8 +2,18 @@ declare global {
   interface Window {
     ferdi: any;
   }
-}
 
+  namespace NodeJS {
+    interface ProcessEnv {
+      GITHUB_AUTH_TOKEN: string;
+      NODE_ENV: 'development' | 'production';
+      FERDI_APPDATA_DIR?: string;
+      PORTABLE_EXECUTABLE_DIR?: string;
+      ELECTRON_IS_DEV?: string;
+      APPDATA?: string;
+    }
+  }
+}
 /**
  * Workaround to make TS recognize this file as a module.
  * https://fettblog.eu/typescript-augmenting-global-lib-dom/
diff --git a/src/environment.ts b/src/environment.ts
index ca1380199..b51b0aae1 100644
--- a/src/environment.ts
+++ b/src/environment.ts
@@ -38,15 +38,11 @@ export const ferdiLocale = app.getLocale();
 // Set app directory before loading user modules
 if (process.env.FERDI_APPDATA_DIR != null) {
   app.setPath('appData', process.env.FERDI_APPDATA_DIR);
-  app.setPath('userData', join(app.getPath('appData')));
+  app.setPath('userData', app.getPath('appData'));
 } else if (process.env.PORTABLE_EXECUTABLE_DIR != null) {
-  app.setPath(
-    'appData',
-    process.env.PORTABLE_EXECUTABLE_DIR,
-    `${app.name}AppData`,
-  );
+  app.setPath('appData', join(process.env.PORTABLE_EXECUTABLE_DIR, `${app.name}AppData`));
   app.setPath('userData', join(app.getPath('appData'), `${app.name}AppData`));
-} else if (is.windows) {
+} else if (is.windows && process.env.APPDATA != null) {
   app.setPath('appData', process.env.APPDATA);
   app.setPath('userData', join(app.getPath('appData'), app.name));
 }