From 4cbdf994a37cd4095e689b9c1c0d12f10783734d Mon Sep 17 00:00:00 2001
From: Tim Edwards <liststuff@fastmail.com.au>
Date: Sat, 20 Apr 2019 06:34:53 +0200
Subject: [PATCH] Cleaned up and working, using websockify from the Ubuntu apt
 repo

---
 snap/snapcraft.yaml | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 017c021d..ab6a29c1 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -6,26 +6,15 @@ description: |
   Open Source VNC client using HTML5 (WebSockets, Canvas).
   noVNC is both a VNC client JavaScript library as well as an application built on top of that library. noVNC runs well in any modern browser including mobile browsers (iOS and Android).
 
-grade: devel # must be 'stable' to release into candidate/stable channels
-confinement: devmode # use 'strict' once you have the right plugs and slots
+grade: stable
+confinement: strict
 
 parts:
     novnc:
-        source: https://github.com/tkedwards/noVNC.git # https://github.com/novnc/noVNC/archive/v$SNAPCRAFT_PROJECT_VERSION.tar.gz
+        source: https://github.com/novnc/noVNC/archive/v$SNAPCRAFT_PROJECT_VERSION.tar.gz 
         plugin: dump
-        source-type: git # only until my changes get commited
-        build-packages: # only until my changes get commited
-            - git       
-        #stage-snaps:
-        #    - websockify
-    websockify:
-        source: https://github.com/novnc/websockify
-        plugin: dump
-        source-type: git
-        build-packages:
-            - git
-        organize: # avoid filename conflicts with files from the novnc part
-            '*': utils/websockify/
+        stage-packages:
+            - websockify
 apps:
     novnc:
         command: utils/launch.sh