From a8df2444a9d3b583f1bd5c3bead33a170bb891bd Mon Sep 17 00:00:00 2001
From: Akos Kitta <kittaakos@typefox.io>
Date: Wed, 31 Mar 2021 16:21:18 +0200
Subject: [PATCH] ATL-1145: Suppress error if Git is not on `$PATH`.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
---
 .../src/node/arduino-ide-backend-module.ts    |  5 +++
 .../src/node/theia/git/git-init.ts            | 44 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 arduino-ide-extension/src/node/theia/git/git-init.ts

diff --git a/arduino-ide-extension/src/node/arduino-ide-backend-module.ts b/arduino-ide-extension/src/node/arduino-ide-backend-module.ts
index b5ca3fc2..e31778c1 100644
--- a/arduino-ide-extension/src/node/arduino-ide-backend-module.ts
+++ b/arduino-ide-extension/src/node/arduino-ide-backend-module.ts
@@ -34,6 +34,8 @@ import { NotificationServiceServerImpl } from './notification-service-server';
 import { NotificationServiceServer, NotificationServiceClient, NotificationServicePath } from '../common/protocol';
 import { BackendApplication } from './theia/core/backend-application';
 import { BoardDiscovery } from './board-discovery';
+import { DefaultGitInit } from './theia/git/git-init';
+import { GitInit } from '@theia/git/lib/node/init/git-init';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(BackendApplication).toSelf().inSingletonScope();
@@ -164,4 +166,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
         return parentLogger.child('monitor-service');
     }).inSingletonScope().whenTargetNamed('monitor-service');
 
+    bind(DefaultGitInit).toSelf();
+    rebind(GitInit).toService(DefaultGitInit);
+
 });
diff --git a/arduino-ide-extension/src/node/theia/git/git-init.ts b/arduino-ide-extension/src/node/theia/git/git-init.ts
new file mode 100644
index 00000000..d9a51ab5
--- /dev/null
+++ b/arduino-ide-extension/src/node/theia/git/git-init.ts
@@ -0,0 +1,44 @@
+import { injectable } from 'inversify';
+import findGit from 'find-git-exec';
+import { dirname } from 'path';
+import { pathExists } from 'fs-extra';
+import { GitInit } from '@theia/git/lib/node/init/git-init';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+
+@injectable()
+export class DefaultGitInit implements GitInit {
+
+    protected readonly toDispose = new DisposableCollection();
+
+    async init(): Promise<void> {
+        const { env } = process;
+        try {
+            const { execPath, path, version } = await findGit();
+            if (!!execPath && !!path && !!version) {
+                const dir = dirname(dirname(path));
+                const [execPathOk, pathOk, dirOk] = await Promise.all([pathExists(execPath), pathExists(path), pathExists(dir)]);
+                if (execPathOk && pathOk && dirOk) {
+                    if (typeof env.LOCAL_GIT_DIRECTORY !== 'undefined' && env.LOCAL_GIT_DIRECTORY !== dir) {
+                        console.error(`Misconfigured env.LOCAL_GIT_DIRECTORY: ${env.LOCAL_GIT_DIRECTORY}. dir was: ${dir}`);
+                        return;
+                    }
+                    if (typeof env.GIT_EXEC_PATH !== 'undefined' && env.GIT_EXEC_PATH !== execPath) {
+                        console.error(`Misconfigured env.GIT_EXEC_PATH: ${env.GIT_EXEC_PATH}. execPath was: ${execPath}`);
+                        return;
+                    }
+                    process.env.LOCAL_GIT_DIRECTORY = dir;
+                    process.env.GIT_EXEC_PATH = execPath;
+                    console.info(`Using Git [${version}] from the PATH. (${path})`);
+                    return;
+                }
+            }
+        } catch (err) {
+            console.error(err);
+        }
+    }
+
+    dispose(): void {
+        this.toDispose.dispose();
+    }
+
+}