Add support for Git Bash existing terminal interception

Author: pimterry

src/interceptors/terminal/existing-terminal-interceptor.ts

@@ -4,7 +4,7 @@ import { Mockttp, getLocal } from 'mockttp';
 import { Interceptor } from '..';
 import { HtkConfig } from '../../config';
 import { getTerminalEnvVars } from './terminal-env-overrides';
-import { getBashShellScript, getFishShellScript, getPowerShellScript } from './terminal-scripts';
+import { getBashShellScript, getFishShellScript, getGitBashShellScript, getPowerShellScript } from './terminal-scripts';
 
 interface ServerState {
     server: Mockttp;
@@ -18,6 +18,11 @@ const getBashDefinition = (port: number) => ({
     command: `eval "$(curl -sS localhost:${port}/setup)"`
 });
 
+const getGitBashDefinition = (port: number) => ({
+    description: "Git Bash",
+    command: `eval "$(curl -sS localhost:${port}/gb-setup)"`
+});
+
 const getFishDefinition = (port: number) => ({
     description: "Fish",
     command: `curl -sS localhost:${port}/fish-setup | source`
@@ -31,7 +36,8 @@ const getPowershellDefinition = (port: number) => ({
 function getShellCommands(port: number): { [shellName: string]: ShellDefinition } {
     if (process.platform === 'win32') {
         return {
-            'Powershell': getPowershellDefinition(port)
+            'Powershell': getPowershellDefinition(port),
+            'Git Bash': getGitBashDefinition(port)
         }
     } else {
         return {
@@ -84,6 +90,10 @@ export class ExistingTerminalInterceptor implements Interceptor {
             getBashShellScript(server.urlFor('/success'), envVars),
             { "content-type": "text/x-shellscript" }
         );
+        await server.forGet('/gb-setup').thenReply(200,
+            getGitBashShellScript(server.urlFor('/success'), envVars),
+            { "content-type": "text/x-shellscript" }
+        );
         await server.forGet('/fish-setup').thenReply(200,
             getFishShellScript(server.urlFor('/success'), envVars),
             { "content-type": "application/x-fish" }

src/interceptors/terminal/terminal-scripts.ts

@@ -88,6 +88,19 @@ export const getBashShellScript = (callbackUrl: string, env: { [name: string]: s
     echo 'HTTP Toolkit interception enabled'
 `;
 
+// Build a Bash script, but first just translate the $PATH (which Git Bash expects to include its own
+// path-format strings) from Windows to Git Bash format.
+export const getGitBashShellScript = (callbackUrl: string, env: { [name: string]: string }) =>
+    getBashShellScript(callbackUrl, {
+        ...env,
+        // We convert path from being the override bin & ; separator to /C/path/to/overrides.
+        PATH: env['PATH']
+            .replace(
+                `${OVERRIDE_BIN_PATH};`,
+                POSIX_OVERRIDE_BIN_PATH + ':' // Unix format $PATH separator
+            )
+    });
+
 export const getFishShellScript = (callbackUrl: string, env: { [name: string]: string }) => `${
         _.map(env, (value, key) => `    set -x ${key} "${value.replace(/"/g, '\\"')}"`).join('\n')
     }