From 0f5afc9ee578bf79d8dbaf0ca0c09e7936bb7e5e Mon Sep 17 00:00:00 2001
From: Joao Moreno <mail@joaomoreno.com>
Date: Thu, 26 Nov 2015 14:41:50 +0100
Subject: [PATCH] cleanup gitApp

---
 .../parts/git/electron-browser/gitApp.ts      | 65 +++++++------------
 1 file changed, 24 insertions(+), 41 deletions(-)

diff --git a/src/vs/workbench/parts/git/electron-browser/gitApp.ts b/src/vs/workbench/parts/git/electron-browser/gitApp.ts
index 0b81bf5eb6d..6de5d1800ae 100644
--- a/src/vs/workbench/parts/git/electron-browser/gitApp.ts
+++ b/src/vs/workbench/parts/git/electron-browser/gitApp.ts
@@ -10,54 +10,37 @@ import uri from 'vs/base/common/uri';
 import gitlib = require('vs/workbench/parts/git/node/git.lib');
 import rawgitservice = require('vs/workbench/parts/git/node/rawGitService');
 
-import path = require('path');
-import fs = require('fs');
+import { join, dirname, normalize } from 'path';
+import { tmpdir } from 'os';
+import { writeFileSync } from 'fs';
 
-class NativeRawGitService extends rawgitservice.RawGitService {
+class IPCRawGitService extends rawgitservice.RawGitService {
 
 	constructor(gitPath: string, basePath: string, defaultEncoding: string, exePath: string) {
 		if (!gitPath) {
 			super(null);
-			return;
+		} else {
+			const gitRootPath = uri.parse(require.toUrl('vs/workbench/parts/git/electron-main')).fsPath;
+			const bootstrapPath = `${ uri.parse(require.toUrl('bootstrap')).fsPath }.js`;
+
+			const env = objects.assign({}, process.env, {
+				GIT_ASKPASS: join(gitRootPath, 'askpass.sh'),
+				VSCODE_GIT_ASKPASS_BOOTSTRAP: bootstrapPath,
+				VSCODE_GIT_ASKPASS_NODE: exePath,
+				VSCODE_GIT_ASKPASS_MODULE_ID: 'vs/workbench/parts/git/electron-main/askpass'
+			});
+
+			const git = new gitlib.Git({
+				gitPath: gitPath,
+				tmpPath: tmpdir(),
+				defaultEncoding: defaultEncoding,
+				env: env
+			});
+
+			super(git.open(normalize(basePath)));
 		}
-
-		var gitRootPath = uri.parse(require.toUrl('vs/workbench/parts/git/electron-main')).fsPath;
-
-		var env = objects.assign(objects.assign({}, process.env), {
-			GIT_ASKPASS: path.join(gitRootPath, 'askpass.sh'),
-			VSCODE_GIT_ASKPASS_BOOTSTRAP: path.join(path.dirname(path.dirname(path.dirname(path.dirname(path.dirname(gitRootPath))))), 'bootstrap.js'),
-			VSCODE_GIT_ASKPASS_NODE: exePath,
-			VSCODE_GIT_ASKPASS_MODULE_ID: 'vs/workbench/parts/git/electron-main/askpass'
-		});
-
-		var git = new gitlib.Git({
-			gitPath: gitPath,
-			tmpPath: tmpdirSync(), // TODO@Joao os.tmpdir()???
-			defaultEncoding: defaultEncoding,
-			env: env
-		});
-
-		super(git.open(path.normalize(basePath)));
 	}
 }
 
-function tmpdirSync(): string {
-	var path: string;
-	var paths = /^win/i.test(process.platform) ? [process.env.TMP, process.env.TEMP] : ['/tmp', '/var/tmp', '/private/tmp', '/private/var/tmp'];
-
-	for (var i = 0; i < paths.length; i++) {
-		path = paths[i];
-		try {
-			if (fs.statSync(path).isDirectory()) {
-				return path;
-			}
-		} catch (e) {
-			// Ignore
-		}
-	}
-
-	throw new Error('Temp dir not found');
-}
-
 const server = new Server();
-server.registerService('GitService', new NativeRawGitService(process.argv[2], process.argv[3], process.argv[4], process.argv[5]));
\ No newline at end of file
+server.registerService('GitService', new IPCRawGitService(process.argv[2], process.argv[3], process.argv[4], process.argv[5]));
\ No newline at end of file
-- 
GitLab