From 17f264e6bd714307601c45a7c31a6f935ae4d51a Mon Sep 17 00:00:00 2001
From: Oj <oj@oojmed.com>
Date: Sat, 29 Jan 2022 11:03:08 +0000
Subject: [PATCH] [AutoStart > Linux] Clean up code (rewrite to simplify and
 not use as much)

---
 src/autoStart/linux.js | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/autoStart/linux.js b/src/autoStart/linux.js
index e9701ef..b4abdbd 100644
--- a/src/autoStart/linux.js
+++ b/src/autoStart/linux.js
@@ -1,16 +1,15 @@
 const fs = require('fs');
-const path = require('path');
+const mkdirp = require('mkdirp');
+const { join, basename, dirname } = require('path');
 const { app } = require('electron');
 
 const buildInfo = require('../utils/buildInfo');
 
-const autostartDir = path.join(app.getPath('appData'), 'autostart');
-const desktopPath = path.join(autostartDir, (app.name ? app.name : app.getName()) + '-' + buildInfo.releaseChannel + '.desktop');
+const desktopPath = join(app.getPath('appData'), 'autostart', app.name + '-' + buildInfo.releaseChannel + '.desktop');
 
 // Vars for use in desktop file content template
-const appName = path.basename(process.execPath, '.exe');
 const exePath = global.systemElectron ? '/usr/share/pixmaps/Discord' : app.getPath('exe');
-const iconPath = path.join(path.dirname(exePath), 'discord.png');
+const iconPath = join(dirname(exePath), 'discord.png');
 
 // Template for desktop file
 const desktopContent = `[Desktop Entry]
@@ -18,7 +17,7 @@ Type=Application
 Exec=${exePath}
 Hidden=false
 NoDisplay=false
-Name=${appName}
+Name=${basename(process.execPath, '.exe')}
 Icon=${iconPath}
 Comment=Text and voice chat for gamers.
 X-GNOME-Autostart-enabled=true`;
@@ -27,10 +26,7 @@ exports.install = (callback) => {
   log('AutoStart', 'Install');
 
   try {
-    fs.mkdirSync(autostartDir);
-  } catch (_e) { } // Already exists, ignore
-
-  try {
+    mkdirp.sync(dirname(desktopPath));
     return fs.writeFile(desktopPath, desktopContent, callback);
   } catch (e) {
     log('AutoStart', 'Install: error writing file', e);
@@ -38,18 +34,8 @@ exports.install = (callback) => {
   }
 };
 
-exports.update = (callback) => { // Discord has stub here
-  log('AutoStart', 'Update');
+exports.update = (callback) => callback();
 
-  callback();
-};
+exports.uninstall = (callback) => fs.unlink(desktopPath, callback);
 
-exports.uninstall = (callback) => {
-  log('AutoStart', 'Uninstall');
-
-  return fs.unlink(desktopPath, callback);
-};
-
-exports.isInstalled = (callback) => {
-  return fs.access(desktopPath, fs.constants.F_OK, callback);
-};
\ No newline at end of file
+exports.isInstalled = (callback) => fs.access(desktopPath, fs.constants.F_OK, callback);
\ No newline at end of file