Merge commit 'refs/pull/64392/head' of github.com:Microsoft/vscode into pr/64392

joaomoreno · joaomoreno · commit 9069fdcfc6fa · 2018-12-20T09:59:18.000+01:00
diff --git a/resources/linux/snap/snapUpdate.sh b/resources/linux/snap/snapUpdate.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 sleep 2
-@@NAME@@
+$SNAP_NAME
diff --git a/src/vs/platform/update/electron-main/updateService.snap.ts b/src/vs/platform/update/electron-main/updateService.snap.ts
@@ -164,7 +164,7 @@ export class SnapUpdateService extends AbstractUpdateService2 {
 
 		this.isUpdateAvailable().then(result => {
 			if (result) {
-				this.setState(State.Ready({ version: 'something', productVersion: 'someting' }));
+				this.setState(State.Ready({ version: 'something', productVersion: 'something' }));
 			} else {
 				/* __GDPR__
 					"update:notAvailable" : {
@@ -191,20 +191,16 @@ export class SnapUpdateService extends AbstractUpdateService2 {
 	protected doQuitAndInstall(): void {
 		this.logService.trace('update#quitAndInstall(): running raw#quitAndInstall()');
 
-		if (typeof process.env.SNAP === 'undefined') {
-			return;
-		}
-
 		// Allow 3 seconds for VS Code to close
-		spawn('bash', ['-c', path.join(process.env.SNAP, `usr/share/${product.applicationName}/snapUpdate.sh`)], {
+		spawn('bash', ['-c', path.join(process.env.SNAP!, `usr/share/${product.applicationName}/snapUpdate.sh`)], {
 			detached: true,
 			stdio: ['ignore', 'ignore', 'ignore']
 		});
 	}
 
 	private isUpdateAvailable(): Promise<boolean> {
 		return new Promise((c, e) => {
-			realpath(`/snap/${product.applicationName}/current`, (err, resolvedCurrentSnapPath) => {
+			realpath(`${path.dirname(process.env.SNAP!)}/current`, (err, resolvedCurrentSnapPath) => {
 				if (err) { return e(err); }
 
 				const currentRevision = path.basename(resolvedCurrentSnapPath);

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 #!/bin/sh
 sleep 2
 -@@NAME@@
 +$SNAP_NAME