Merge pull request #162 from Accedia/develop

Develop

Author: gbogomilovAccedia

electron-app/package-lock.json

@@ -2,7 +2,7 @@
   "name": "fit-mitchell-rpa",
   "appname": "REV Import Technology",
   "productName": "REV Import Technology",
-  "version": "1.5.92",
+  "version": "1.5.93",
   "homepage": "./",
   "main": "./dist/main.js",
   "description": "Automation for CCC by FIT",

electron-app/package.json

@@ -14,6 +14,10 @@ import log from 'electron-log';
 import { FirebaseService, SessionStatus } from './utils/firebase';
 import mitchell_importer from './utils/mitchell_importer';
 import { spawn } from 'child_process';
+import * as os from 'os';
+
+const userHomeDir = os.homedir();
+const fitMitchellCloudPath = path.join(userHomeDir, 'AppData', 'Local', 'FIT-Mitchell_Cloud', 'FIT.bat');
 
 const INPUT_SPEED_STORAGE_KEY = 'inputSpeed';
 
@@ -62,7 +66,10 @@ class Main {
         const url = getCustomProtocolUrl(argv);
         if (argv.some((url) => url.includes('openVBS'))) {
           try {
-            const bat = spawn('C:\\FIT-Mitchell-Cloud-RO-Import-Tool\\FIT.bat', [], { windowsHide: true });
+            log.info(fitMitchellCloudPath);
+            const bat = spawn(fitMitchellCloudPath, [], { windowsHide: true });
+            log.info('here');
+            
             bat.on('close', (code) => {
             log.info(`Child process exited with code ${code}`);
               app.quit();

electron-app/src/main.ts

@@ -12,6 +12,10 @@ import { extractSessionIdFromUrl } from './extract_sessionid_from_url';
 import mitchell_importer from './mitchell_importer';
 import log from 'electron-log';
 import { spawn } from 'child_process';
+import * as os from 'os';
+
+const userHomeDir = os.homedir();
+const fitMitchellCloudPath = path.join(userHomeDir, 'AppData', 'Local', 'FIT-Mitchell_Cloud', 'FIT.bat');
 
 type MaybeBrowserWindow = BrowserWindow | null;
 
@@ -76,7 +80,7 @@ class WindowManager {
       console.log('VBS URL', process.argv);
       if (shouldOpenVBS) {
         try {
-          const bat = spawn('C:\\FIT-Mitchell-Cloud-RO-Import-Tool\\FIT.bat', [], { windowsHide: true });
+          const bat = spawn(fitMitchellCloudPath, [], { windowsHide: true });
           bat.on('close', (code) => {
             console.log(`Child process exited with code ${code}`);
             app.quit();