Merge pull request microsoft#65579 from Kedstar99/snapFix

Removed snapUpdate.sh and replaced with inline command
sliker · Jan 28, 2019 · eb69d48 · eb69d48
2 parents 5d5d386 + 4c02c55
commit eb69d48
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 23 deletions.
diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
@@ -215,13 +215,10 @@ function prepareSnapPackage(arch) {
 			.pipe(replace('@@VERSION@@', commit.substr(0, 8)))
 			.pipe(rename('snap/snapcraft.yaml'));
 
-		const snapUpdate = gulp.src('resources/linux/snap/snapUpdate.sh', { base: '.' })
-			.pipe(rename(`usr/share/${product.applicationName}/snapUpdate.sh`));
-
 		const electronLaunch = gulp.src('resources/linux/snap/electron-launch', { base: '.' })
 			.pipe(rename('electron-launch'));
 
-		const all = es.merge(desktop, icon, code, snapcraft, electronLaunch, snapUpdate);
+		const all = es.merge(desktop, icon, code, snapcraft, electronLaunch);
 
 		return all.pipe(vfs.dest(destination));
 	};

diff --git a/resources/linux/snap/snapUpdate.sh b/resources/linux/snap/snapUpdate.sh
diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
@@ -125,9 +125,11 @@ export class LinuxUpdateService extends AbstractUpdateService {
 		}
 
 		// Allow 3 seconds for VS Code to close
-		spawn('bash', ['-c', path.join(snap, `usr/share/${product.applicationName}/snapUpdate.sh`)], {
+		spawn('sleep 3 && $SNAP_NAME', {
+			shell: true,
 			detached: true,
-			stdio: ['ignore', 'ignore', 'ignore']
+			stdio: 'ignore',
 		});
+
 	}
 }
diff --git a/src/vs/platform/update/electron-main/updateService.snap.ts b/src/vs/platform/update/electron-main/updateService.snap.ts
@@ -6,15 +6,13 @@
 import { Event, Emitter } from 'vs/base/common/event';
 import { timeout } from 'vs/base/common/async';
 import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
-import product from 'vs/platform/node/product';
 import { IUpdateService, State, StateType, AvailableForDownload, UpdateType } from 'vs/platform/update/common/update';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
 import * as path from 'path';
 import { realpath, watch } from 'fs';
 import { spawn } from 'child_process';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { stat } from 'vs/base/node/pfs';
 
 abstract class AbstractUpdateService2 implements IUpdateService {
 
@@ -137,8 +135,6 @@ export class SnapUpdateService extends AbstractUpdateService2 {
 
 	_serviceBrand: any;
 
-	private snapUpdatePath: string;
-
 	constructor(
 		private snap: string,
 		private snapRevision: string,
@@ -149,8 +145,6 @@ export class SnapUpdateService extends AbstractUpdateService2 {
 	) {
 		super(lifecycleService, environmentService, logService);
 
-		this.snapUpdatePath = path.join(this.snap, `usr/share/${product.applicationName}/snapUpdate.sh`);
-
 		const watcher = watch(path.dirname(this.snap));
 		const onChange = Event.fromNodeEventEmitter(watcher, 'change', (_, fileName: string) => fileName);
 		const onCurrentChange = Event.filter(onChange, n => n === 'current');
@@ -196,19 +190,14 @@ export class SnapUpdateService extends AbstractUpdateService2 {
 		this.logService.trace('update#quitAndInstall(): running raw#quitAndInstall()');
 
 		// Allow 3 seconds for VS Code to close
-		spawn('bash', ['-c', this.snapUpdatePath], {
+		spawn('sleep 3 && $SNAP_NAME', {
+			shell: true,
 			detached: true,
-			stdio: ['ignore', 'ignore', 'ignore']
+			stdio: 'ignore',
 		});
 	}
 
 	private async isUpdateAvailable(): Promise<boolean> {
-		try {
-			await stat(this.snapUpdatePath);
-		} catch (err) {
-			return false;
-		}
-
 		const resolvedCurrentSnapPath = await new Promise<string>((c, e) => realpath(`${path.dirname(this.snap)}/current`, (err, r) => err ? e(err) : c(r)));
 		const currentRevision = path.basename(resolvedCurrentSnapPath);
 		return this.snapRevision !== currentRevision;