From cdf6ebc21964bf0a7e667d99d0deebdc836e06f6 Mon Sep 17 00:00:00 2001
From: Tim Edwards <liststuff@fastmail.com.au>
Date: Thu, 9 May 2019 01:54:16 +0200
Subject: [PATCH] Added a service wrapper (currently a placeholder) and changed
 snapcraft file back to just specifying 1 service

---
 snap/hooks/configure | 10 ++++++++++
 snap/snapcraft.yaml  | 32 +++++++++-----------------------
 utils/svc_wrapper.py |  3 +++
 3 files changed, 22 insertions(+), 23 deletions(-)
 create mode 100644 snap/hooks/configure
 create mode 100755 utils/svc_wrapper.py

diff --git a/snap/hooks/configure b/snap/hooks/configure
new file mode 100644
index 00000000..1f6bbe7e
--- /dev/null
+++ b/snap/hooks/configure
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+# Obtain sleep-time value
+sleep_time="$(snapctl get sleep-time)"
+
+# Validate it
+if ! expr "$sleep_time" : '^[0-9]*$' > /dev/null; then
+    echo "\"$sleep_time\" is not a valid sleep time" >&2
+    exit 1
+fi
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 703d0be3..0dee089d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -11,35 +11,21 @@ confinement: strict
 
 parts:
     novnc:
-        source: https://github.com/novnc/noVNC.git #https://github.com/novnc/noVNC/archive/v$SNAPCRAFT_PROJECT_VERSION.tar.gz
+        source: https://github.com/tkedwards/noVNC.git # https://github.com/novnc/noVNC.git #https://github.com/novnc/noVNC/archive/v$SNAPCRAFT_PROJECT_VERSION.tar.gz 
         plugin: dump
+        source-branch: snap_package
         stage-packages:
             - websockify
+
+hooks:
+    configure:
+        plugs: [network, network-bind]
+
 apps:
     novnc:
         command: utils/launch.sh
         plugs: [network, network-bind]
-    n5900:
-        command: utils/launch.sh --vnc localhost:5900 --listen 6080
-        daemon: simple
-        plugs: [network, network-bind]
-    n5901:
-        command: utils/launch.sh --vnc localhost:5901 --listen 6081
-        daemon: simple
-        plugs: [network, network-bind]
-    n5902:
-        command: utils/launch.sh --vnc localhost:5902 --listen 6082
-        daemon: simple
-        plugs: [network, network-bind]
-    n5903:
-        command: utils/launch.sh --vnc localhost:5903 --listen 6083
-        daemon: simple
-        plugs: [network, network-bind]
-    n5904:
-        command: utils/launch.sh --vnc localhost:5904 --listen 6084
-        daemon: simple
-        plugs: [network, network-bind]
-    n5905:
-        command: utils/launch.sh --vnc localhost:5905 --listen 6085
+    novncsvc:
+        command: utils/svc_wrapper.py
         daemon: simple
         plugs: [network, network-bind]
diff --git a/utils/svc_wrapper.py b/utils/svc_wrapper.py
new file mode 100755
index 00000000..066c83ef
--- /dev/null
+++ b/utils/svc_wrapper.py
@@ -0,0 +1,3 @@
+#!/usr/bin/env python3
+
+