diff --git a/build/filters.js b/build/filters.js index 376a77ac64a8b..877ccb8a17fac 100644 --- 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 index 3423e86e8f3e5..747bfb98a57c2 100644 --- 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 deleted file mode 100755 index 26e37d5a33630..0000000000000 --- a/resources/linux/snap/electron-launch +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec $@ diff --git a/resources/linux/snap/snapcraft.yaml b/resources/linux/snap/snapcraft.yaml index 7d178e2b92171..83ac1e5c23a0b 100644 --- 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: