Merge pull request #17370 from aperezdc/flatpak-niceties

Add a few niceties for making Flatpak builds of VSCode

build/gulpfile.vscode.linux.js

@@ -215,8 +215,21 @@ function buildFlatpak(arch) {
 	];
 	const buildOptions = {
 		arch: flatpakArch,
-		bundlePath: manifest.appId + '-' + flatpakArch + '.flatpak',
+		subject: product.nameLong + ' ' + packageJson.version + '.' + linuxPackageRevision,
 	};
+	// If requested, use the configured path for the OSTree repository.
+	if (process.env.FLATPAK_REPO) {
+		buildOptions.repoDir = process.env.FLATPAK_REPO;
+	} else {
+		buildOptions.bundlePath = manifest.appId + '-' + flatpakArch + '.flatpak';
+	}
+	// Setup PGP signing if requested.
+	if (process.env.GPG_KEY_ID !== undefined) {
+		buildOptions.gpgSign = process.env.GPG_KEY_ID;
+		if (process.env.GPG_HOMEDIR) {
+			buildOptions.gpgHomedir = process.env.GPG_HOME_DIR;
+		}
+	}
 	return function (cb) {
 		require('flatpak-bundler').bundle(manifest, buildOptions, cb);
 	}