From 9c4711cb60a6e5ee46a21338a6c75db0786372c3 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Thu, 18 Aug 2016 15:38:14 +0200
Subject: [PATCH] cleanup update manager

---
 src/vs/code/electron-main/update-manager.ts | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/vs/code/electron-main/update-manager.ts b/src/vs/code/electron-main/update-manager.ts
index 5d8ec3d25cb..c82e6191e7e 100644
--- a/src/vs/code/electron-main/update-manager.ts
+++ b/src/vs/code/electron-main/update-manager.ts
@@ -8,9 +8,8 @@
 import * as fs from 'original-fs';
 import * as path from 'path';
 import * as electron from 'electron';
-import * as platform from 'vs/base/common/platform';
 import { EventEmitter } from 'events';
-import { IEnvService, getPlatformIdentifier } from 'vs/code/electron-main/env';
+import { IEnvService } from 'vs/code/electron-main/env';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { Win32AutoUpdaterImpl } from 'vs/code/electron-main/auto-updater.win32';
 import { LinuxAutoUpdaterImpl } from 'vs/code/electron-main/auto-updater.linux';
@@ -85,11 +84,11 @@ export class UpdateManager extends EventEmitter implements IUpdateService {
 		this._feedUrl = null;
 		this._channel = null;
 
-		if (platform.isWindows) {
+		if (process.platform === 'win32') {
 			this.raw = instantiationService.createInstance(Win32AutoUpdaterImpl);
-		} else if (platform.isLinux) {
+		} else if (process.platform === 'linux') {
 			this.raw = instantiationService.createInstance(LinuxAutoUpdaterImpl);
-		} else if (platform.isMacintosh) {
+		} else if (process.platform === 'darwin') {
 			this.raw = electron.autoUpdater;
 		}
 
@@ -153,7 +152,7 @@ export class UpdateManager extends EventEmitter implements IUpdateService {
 			// for some reason updating on Mac causes the local storage not to be flushed.
 			// we workaround this issue by forcing an explicit flush of the storage data.
 			// see also https://github.com/Microsoft/vscode/issues/172
-			if (platform.isMacintosh) {
+			if (process.platform === 'darwin') {
 				electron.session.defaultSession.flushStorageData();
 			}
 
@@ -241,7 +240,7 @@ export class UpdateManager extends EventEmitter implements IUpdateService {
 			return null;
 		}
 
-		if (platform.isWindows && !fs.existsSync(path.join(path.dirname(process.execPath), 'unins000.exe'))) {
+		if (process.platform === 'win32' && !fs.existsSync(path.join(path.dirname(process.execPath), 'unins000.exe'))) {
 			return null;
 		}
 
@@ -249,6 +248,8 @@ export class UpdateManager extends EventEmitter implements IUpdateService {
 			return null;
 		}
 
-		return `${this.envService.updateUrl}/api/update/${getPlatformIdentifier()}/${channel}/${this.envService.product.commit}`;
+		const platform = process.platform === 'linux' ? `linux-${process.arch}` : process.platform;
+
+		return `${ this.envService.updateUrl }/api/update/${ platform }/${ channel }/${ this.envService.product.commit }`;
 	}
 }