fix the setup script to correctly install node_modules dependencies

renderer/src/setup/index.js

@@ -239,10 +239,10 @@ async function getDiscordAppPath () {
  * Used in this script for installing Node package dependencies.
  * @returns {Promise<void>}
  */
-function installDependencies () {
+async function installDependencies () {
   return new Promise((resolve, reject) => {
     const command = spawn('npm', [ 'install', '--only=production', '--silent' ], {
-      cwd: join(__dirname, '..', '..', '..'),
+      cwd: join(__dirname, '..'),
       stdio: 'inherit',
       shell: true
     });
@@ -288,11 +288,11 @@ async function ensureDependencies () {
       }
     }
 
-    const missingDependenciesMessage =  `${missingDependencies.length} missing`;
-    const outdatedDependenciesMessage =  `${outdatedDependencies.length} outdated`;
+    const missingDependenciesMessage =  missingDependencies.length && `${missingDependencies.length} missing`;
+    const outdatedDependenciesMessage =  outdatedDependencies.length && `${outdatedDependencies.length} outdated`;
 
-    if (missingDependencies.length || outdatedDependencies.length) {
-      warn(`Found ${[ missingDependenciesMessage, outdatedDependenciesMessage ].filter(message => message)} ${missingDependencies.length + outdatedDependencies.length > 1 ? 'packages' : 'package'}. Resolving...`);
+    if (missingDependenciesMessage || outdatedDependenciesMessage) {
+      warn(`Found ${[ missingDependenciesMessage, outdatedDependenciesMessage ].filter(Boolean).join(' and ')} ${missingDependencies.length + outdatedDependencies.length > 1 ? 'packages' : 'package'}. Resolving...`);
     }
 
     /**
@@ -310,9 +310,10 @@ async function ensureDependencies () {
 /**
  * Uninjects Vizality from Discord.
  * @param {path} discordAppPath Discord app path
+ * @param {boolean} vizality Whether or not the client mod is known to be Vizality
  * @returns {Promise<void>}
  */
-async function uninject (discordAppPath) {
+async function uninject (discordAppPath, vizality = true) {
   /**
    * Check for a valid Discord app directory.
    */
@@ -334,7 +335,7 @@ async function uninject (discordAppPath) {
    */
   await rm(discordAppPath, { recursive: true, force: true });
   brand('-----------------------------------------------');
-  brand('Vizality has been uninjected.');
+  brand(`${vizality ? 'Vizality' : 'Client modification'} has been uninjected.`);
   brand('-----------------------------------------------');
 }
 
@@ -360,7 +361,7 @@ async function inject (discordAppPath) {
     ]);
 
     if (responses.action.includes('Yes')) {
-      return reinject(discordAppPath);
+      return reinject(discordAppPath, false);
     }
 
     warn('Vizality injection canceled. Now exiting...');
@@ -388,10 +389,11 @@ async function inject (discordAppPath) {
 /**
  * Reinjects Vizality into Discord.
  * @param {path} discordAppPath Discord app path
+ * @param {boolean} vizality Whether or not the client mod is known to be Vizality
  * @returns {Promise<void>}
  */
-async function reinject (discordAppPath) {
-  await uninject(discordAppPath);
+async function reinject (discordAppPath, vizality = true) {
+  await uninject(discordAppPath, vizality);
   await inject(discordAppPath);
 }