From 1d8b6bd409010f849ecd52b62d2b32a6f7db8eb5 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Wed, 31 Jan 2018 15:43:46 -0800
Subject: [PATCH] Update snap build

---
 resources/linux/snap/electron-launch | 29 +---------------------------
 resources/linux/snap/snapcraft.yaml  | 16 +++++++--------
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/resources/linux/snap/electron-launch b/resources/linux/snap/electron-launch
index aa403d5e072..65c91d6fc1b 100644
--- a/resources/linux/snap/electron-launch
+++ b/resources/linux/snap/electron-launch
@@ -1,30 +1,3 @@
 #!/bin/sh
 
-if test "$1" = "classic"; then
-	shift
-	case $SNAP_ARCH in
-		amd64)
-			TRIPLET="x86_64-linux-gnu"
-			;;
-		armhf)
-			TRIPLET="arm-linux-gnueabihf"
-			;;
-		arm64)
-			TRIPLET="aarch64-linux-gnu"
-			;;
-		*)
-			TRIPLET="$(uname -p)-linux-gnu"
-			;;
-	esac
-
-	# TODO: Swap LD lib paths whenever processes are launched
-	export LD_LIBRARY_PATH_OLD=$LD_LIBRARY_PATH
-	export LD_LIBRARY_PATH=$SNAP/usr/lib:$SNAP/usr/lib/$TRIPLET:$LD_LIBRARY_PATH
-	export LD_LIBRARY_PATH=$SNAP/lib:$SNAP/lib/$TRIPLET:$LD_LIBRARY_PATH
-fi
-
-# Correct the TMPDIR path for Chromium Framework/Electron to ensure
-# libappindicator has readable resources.
-export TMPDIR=$XDG_RUNTIME_DIR
-
-exec ${SNAP}/bin/desktop-launch $@
+exec "$@" --executed-from="$(pwd)" --pid=$$
diff --git a/resources/linux/snap/snapcraft.yaml b/resources/linux/snap/snapcraft.yaml
index 3b5daa2a8c5..e8a5d48fdf1 100644
--- a/resources/linux/snap/snapcraft.yaml
+++ b/resources/linux/snap/snapcraft.yaml
@@ -13,17 +13,21 @@ parts:
   code:
     plugin: dump
     source: .
-    after:
-      - desktop-gtk2
     stage-packages:
-      - gconf2
       - libasound2
+      - libgconf2-4
       - libnotify4
       - libnspr4
       - libnss3
+      - libpcre3
       - libpulse0
       - libxss1
       - libxtst6
+      # desktop-gtk2 deps below
+      - libxkbcommon0
+      - libgtk2.0-0
+      # - unity-gtk2-module
+      - libappindicator1
     prime:
       - -usr/share/dh-python
   electron-launch:
@@ -31,12 +35,8 @@ parts:
     source: .
     organize:
       electron-launch: bin/electron-launch
-    prime:
-      - -monitor.sh
-      - -OLD_VERSION
-      - -*.bz2
 
 apps:
   @@NAME@@:
-    command: bin/electron-launch classic ${SNAP}/usr/share/@@NAME@@/bin/@@NAME@@
+    command: bin/electron-launch ${SNAP}/usr/share/@@NAME@@/bin/@@NAME@@
     desktop: usr/share/applications/@@NAME@@.desktop
\ No newline at end of file
-- 
GitLab