Merge .deb postinst and postinst.oss0.10.14-insiders

3 files changed, 25 insertions, 41 deletions

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 7b28d6b751c..8e6ef1cf3cd 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -292,23 +292,14 @@ function prepareDebPackage(arch) {
 			.pipe(replace('@@NAME@@', product.applicationName))
 			.pipe(rename('DEBIAN/prerm'))
 
-		var all = es.merge(control, prerm, desktop, icon, shortcut, code);
-
-		// Register an apt repository if this is an official build
-		if (product.updateUrl && product.quality) {
-			var postinst = gulp.src('resources/linux/debian/postinst.template', { base: '.' })
-				.pipe(replace('@@NAME@@', product.applicationName))
-				.pipe(replace('@@UPDATEURL@@', product.updateUrl))
-				.pipe(replace('@@QUALITY@@', product.quality))
-				.pipe(replace('@@ARCHITECTURE@@', debArch))
-				.pipe(rename('DEBIAN/postinst'))
-			all = es.merge(all, postinst);
-		} else {
-			var postinst = gulp.src('resources/linux/debian/postinst.oss.template', { base: '.' })
-				.pipe(replace('@@NAME@@', product.applicationName))
-				.pipe(rename('DEBIAN/postinst'))
-			all = es.merge(all, postinst);
-		}
+		var postinst = gulp.src('resources/linux/debian/postinst.template', { base: '.' })
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(replace('@@ARCHITECTURE@@', debArch))
+			.pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@'))
+			.pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@'))
+			.pipe(rename('DEBIAN/postinst'))
+
+		var all = es.merge(control, postinst, prerm, desktop, icon, shortcut, code);
 
 		return all.pipe(symdest(destination));
 	};
diff --git a/resources/linux/debian/postinst.oss.template b/resources/linux/debian/postinst.oss.template
deleted file mode 100755
index f584ee6849d..00000000000
--- a/resources/linux/debian/postinst.oss.template
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-
-# Register code in the alternatives system
-# Priority of 0 should never make code the default editor in auto mode as most
-# developers would prefer a terminal editor as the default.
-update-alternatives --install /usr/bin/editor editor /usr/bin/@@NAME@@ 0
diff --git a/resources/linux/debian/postinst.template b/resources/linux/debian/postinst.template
index ce17ab55956..f8d06c1c1c5 100755
--- a/resources/linux/debian/postinst.template
+++ b/resources/linux/debian/postinst.template
@@ -8,21 +8,23 @@
 # developers would prefer a terminal editor as the default.
 update-alternatives --install /usr/bin/editor editor /usr/bin/@@NAME@@ 0
 
-# Remove the legacy bin command if this is the stable build
-if [ "@@NAME@@" = "code" ]; then
-	rm -f /usr/local/bin/code
-fi
+if [ "@@NAME@@" != "code-oss" ]; then
+	# Remove the legacy bin command if this is the stable build
+	if [ "@@NAME@@" = "code" ]; then
+		rm -f /usr/local/bin/code
+	fi
 
-# Register repository as an apt source
-get_apt_config_value() {
-	echo $(apt-config dump | grep "$1 " | sed -e "s/$1 \"//" -e "s/\";$//")
-}
+	# Register apt repository
+	get_apt_config_value() {
+		echo $(apt-config dump | grep "$1 " | sed -e "s/$1 \"//" -e "s/\";$//")
+	}
 
-APT_DIR=$(get_apt_config_value Dir)
-APT_ETC=$APT_DIR$(get_apt_config_value Dir::Etc)
-APT_SOURCE_PARTS=$APT_ETC$(get_apt_config_value Dir::Etc::sourceparts)
-CODE_SOURCE_LIST=$APT_SOURCE_PARTS/visual-studio-@@NAME@@.list
+	APT_DIR=$(get_apt_config_value Dir)
+	APT_ETC=$APT_DIR$(get_apt_config_value Dir::Etc)
+	APT_SOURCE_PARTS=$APT_ETC$(get_apt_config_value Dir::Etc::sourceparts)
+	CODE_SOURCE_LIST=$APT_SOURCE_PARTS/visual-studio-@@NAME@@.list
 
-rm -f $CODE_SOURCE_LIST
-# TODO: #2973: Enable once the apt repository is signed
-#echo "deb @@UPDATEURL@@/api/deb/@@QUALITY@@/@@ARCHITECTURE@@/ /" > $CODE_SOURCE_LIST
+	rm -f $CODE_SOURCE_LIST
+	# TODO: #2973: Enable once the apt repository is signed
+	#echo "deb @@UPDATEURL@@/api/deb/@@QUALITY@@/@@ARCHITECTURE@@/ /" > $CODE_SOURCE_LIST
+fi
\ No newline at end of file