Merge pull request #26 from bocoup/graceful-exit-on-install-test

Graceful exit if install script detects installation

Author: ChrisC

package.json

@@ -6,10 +6,10 @@
   "scripts": {
     "prettier": "prettier --write shared test",
     "test": "npm run test-style && npm run test-types && npm run test-unit",
-    "test-macos-key-press": "mocha --ui tdd test/test-macos-key-press.js",
+    "test-macos-key-press": "mocha --ui tdd --timeout 5000 test/test-macos-key-press.js",
     "test-style": "prettier --check shared test",
     "test-types": "tsc -p tsconfig.json",
-    "test-unit": "mocha --ui tdd test/test.js test/helpers/**/*.js"
+    "test-unit": "mocha --ui tdd --timeout 5000 test/test.js test/helpers/**/*.js"
   },
   "author": "",
   "license": "MIT",

shared/commands/install.js

@@ -17,7 +17,5 @@ module.exports = /** @type {import('yargs').CommandModule} */ ({
       win32: () => require('../install/win32'),
     });
     await installDelegate.install({ unattended });
-
-    console.log('Installation completed successfully.');
   },
 });

shared/install/macos.js

@@ -103,13 +103,14 @@ exports.install = async function ({ unattended }) {
   }
 
   if (await isInstalled()) {
-    throw new Error('Already installed');
+    return console.log('Already installed.');
   }
 
   await removeQuarantine(options);
   await registerExtensions(options);
   await enableExtension();
   await setSystemVoice(VOICE_IDENTIFIER);
+  console.log('Installation completed successfully.');
 };
 
 /**

shared/install/win32.js

@@ -10,6 +10,7 @@ const MAKE_VOICE_EXE = 'MakeVoice.exe';
 
 exports.install = async function () {
   await exec(`${MAKE_VOICE_EXE}`, await getExecOptions());
+  console.log('Installation completed successfully.');
 };
 
 exports.uninstall = async function () {