Fix GitPortable path 🐛

nfdi4plants · Nov 9, 2023 · f0cdc4a · f0cdc4a
1 parent dd8035a
commit f0cdc4a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/packages/main/src/GitService.ts b/packages/main/src/GitService.ts
@@ -51,10 +51,12 @@ export const GitService = {
         p.stdout.on('data', handleOutput);
         p.stderr.on('data', handleOutput);
 
+        // This hits when the child process cannot be spawned
         p.on('error', err => {
-          console.error(err.toString());
+            console.error("[Git spawn error]", err.toString());
+            resolve([false, err.toString()]);
         });
-
+        // This hits whenever process can be spawned, can still fail or resolve.
         p.on('exit', code => {
           resolve([code===0 && !error,output]);
         });

diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts
@@ -43,16 +43,15 @@ app.on('window-all-closed', () => {
 app.on('activate', restoreOrCreateWindow);
 
 const initCore = async () => {
+  if(process.platform === 'win32'){
+      const PATH = require('path');
+      const process_path_separator = ';';
+      // path to GitPortable executables.
+      process.env['PATH'] += process_path_separator + [process.resourcesPath,'bins','win', 'cmd'].join(PATH.sep);
+  }
   ipcMain.handle('CORE.getVersion', ()=>process.env['npm_package_version']);
 }
 
-// fix portable path
-if(process.platform === 'win32'){
-  const PATH = require('path');
-  const process_path_separator =  ? ';' : ':';
-  process.env['PATH'] += process.env['PATH'] + process_path_separator + PATH.join([process.env['PORTABLE_EXECUTABLE_DIR'],'resources','bins']);
-}
-
 /**
  * Create app window when background process will be ready
  */