Auto update package type for windows and linux (#6026)

posit-dev · Jan 27, 2025 · 7a428dc · 7a428dc
1 parent c3de859
commit 7a428dc
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
@@ -59,6 +59,8 @@ function prepareDebPackage(arch) {
 			.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
 
 		// --- Start Positron ---
+		const json = require('gulp-json-editor');
+
 		const appdata = gulp.src('resources/linux/positron.appdata.xml', { base: '.' })
 			.pipe(replace('@@NAME_LONG@@', product.nameLong))
 			.pipe(replace('@@NAME@@', product.applicationName))
@@ -74,6 +76,11 @@ function prepareDebPackage(arch) {
 		// --- Start Positron ---
 		const icon = gulp.src('resources/linux/positron.png', { base: '.' })
 			.pipe(rename('usr/share/pixmaps/' + product.linuxIconName + '.png'));
+
+		console.log('Updating product.json with DEB package type');
+		gulp.src([binaryDir + '/resources/app/product.json'], { base: '.' })
+			.pipe(json({ packageType: 'deb' }))
+			.pipe(gulp.dest(binaryDir));
 		// --- End Positron ---
 
 		const bash_completion = gulp.src('resources/completions/bash/code')
@@ -189,11 +196,18 @@ function prepareRpmPackage(arch) {
 			.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
 
 		// --- Start Positron ---
+		const json = require('gulp-json-editor');
+
 		const appdata = gulp.src('resources/linux/positron.appdata.xml', { base: '.' })
 			.pipe(replace('@@NAME_LONG@@', product.nameLong))
 			.pipe(replace('@@NAME@@', product.applicationName))
 			.pipe(replace('@@LICENSE@@', product.licenseName))
 			.pipe(rename('BUILD/usr/share/appdata/' + product.applicationName + '.appdata.xml'));
+
+		console.log('Updating product.json with RPM package type');
+		gulp.src([binaryDir + '/resources/app/product.json'], { base: '.' })
+			.pipe(json({ packageType: 'rpm' }))
+			.pipe(gulp.dest(binaryDir));
 		// --- End Positron ---
 
 		const workspaceMime = gulp.src('resources/linux/code-workspace.xml', { base: '.' })

diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
@@ -64,6 +64,9 @@ export interface IProductConfiguration {
 
 	/** The Positron build number; unique within the Positron version */
 	readonly positronBuildNumber: number;
+
+	/** The linux package type (DEB or RPM) */
+	readonly packageType?: string;
 	// --- End Positron ---
 
 	readonly date?: string;

diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
@@ -33,10 +33,9 @@ export class LinuxUpdateService extends AbstractUpdateService {
 
 	protected buildUpdateFeedUrl(channel: string): string {
 		const arch = process.arch === 'x64' ? 'x86_64' : 'arm64';
-		const platform = `deb/${arch}`;
+		const platform = `${this.productService.packageType ?? 'deb'}/${arch}`;
 		const baseUrl = createUpdateURL(platform, channel, this.productService);
 
-		// TODO: properly determine deb or rpm
 		return `${baseUrl}/releases.json`;
 	}
 	// --- End Positron ---

diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -104,11 +104,10 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 	// --- Start Positron ---
 	protected buildUpdateFeedUrl(channel: string): string | undefined {
 		const platform = `win/${process.arch === 'x64' ? 'x86_64' : 'arm64'}`;
-		const prefix = getUpdateType() === UpdateType.Setup ? 'system-' : 'user-';
+		const prefix = this.productService.target;
 		const baseUrl = createUpdateURL(platform, channel, this.productService);
 
-		// TODO: properly determine if this is a user or system install
-		const url = `${baseUrl}/${prefix}releases.json`;
+		const url = `${baseUrl}/${prefix}-releases.json`;
 
 		return url;
 	}