Revert "chore: workaround apps._app_name_.command restriction"

This reverts commit 9c8cc0b.
microsoft · Jul 20, 2021 · 27244ce · 27244ce
1 parent 885f67d
commit 27244ce
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 19 deletions.
diff --git a/build/filters.js b/build/filters.js
@@ -43,7 +43,6 @@ module.exports.indentationFilter = [
 	'!src/vs/base/node/terminateProcess.sh',
 	'!src/vs/base/node/cpuUsage.sh',
 	'!test/unit/assert.js',
-	'!resources/linux/snap/electron-launch',
 	'!build/ext.js',
 
 	// except specific folders

diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
@@ -238,10 +238,7 @@ function prepareSnapPackage(arch) {
 			.pipe(replace('@@ARCHITECTURE@@', arch === 'x64' ? 'amd64' : arch))
 			.pipe(rename('snap/snapcraft.yaml'));
 
-		const electronLaunch = gulp.src('resources/linux/snap/electron-launch', { base: '.' })
-			.pipe(rename('electron-launch'));
-
-		const all = es.merge(desktops, icon, code, snapcraft, electronLaunch);
+		const all = es.merge(desktops, icon, code, snapcraft);
 
 		return all.pipe(vfs.dest(destination));
 	};

diff --git a/resources/linux/snap/electron-launch b/resources/linux/snap/electron-launch
diff --git a/resources/linux/snap/snapcraft.yaml b/resources/linux/snap/snapcraft.yaml
@@ -14,8 +14,6 @@ compression: lzo
 grade: stable
 confinement: classic
 base: core18
-assumes:
-  - snapd2.43
 
 parts:
   code:
@@ -60,17 +58,10 @@ parts:
       [ -d squashfs-root/ ] || exit 1
       mkdir -pv $SNAPCRAFT_PART_INSTALL/gnome-platform
       cp -a squashfs-root/* $SNAPCRAFT_PART_INSTALL/gnome-platform
-  electron-launch-wrapper:
-    source: .
-    plugin: dump
-    after:
-      - code
-    organize:
-      electron-launch : bin/electron-launch
 
 apps:
   @@NAME@@:
-    command: bin/electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --no-sandbox
+    command: $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --no-sandbox
     common-id: @@NAME@@.desktop
     command-chain:
       - snap/command-chain/desktop-launch
@@ -87,7 +78,7 @@ apps:
       SNAP_DESKTOP_RUNTIME: $SNAP/gnome-platform
 
   url-handler:
-    command: bin/electron-launch $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --open-url --no-sandbox
+    command: $SNAP/usr/share/@@NAME@@/bin/@@NAME@@ --open-url --no-sandbox
     command-chain:
       - snap/command-chain/desktop-launch
     plugs: