diff --git a/snap/local/svc_wrapper.sh b/snap/local/svc_wrapper.sh index 7b0be232..51d74645 100755 --- a/snap/local/svc_wrapper.sh +++ b/snap/local/svc_wrapper.sh @@ -24,6 +24,6 @@ snapctl get services | jq -c '.[]' | while read service; do # for each service t echo "novnc: not starting service ${service} with listen_port ${listen_port} and vnc_host_port ${vnc_host_port}" else # start (and fork with '&') the service using the specified listen port and VNC host:port - $SNAP/launch.sh --listen $listen_port --vnc $vnc_host_port & + $SNAP/utils/launch.sh --listen $listen_port --vnc $vnc_host_port & fi done diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index d1bb9dc8..a6b0f78f 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: novnc base: core18 # the base snap is the execution environment for this snap -version: '@VERSION@' +version: 1.2.0 summary: Open Source VNC client using HTML5 (WebSockets, Canvas) description: | Open Source VNC client using HTML5 (WebSockets, Canvas). @@ -13,13 +13,17 @@ confinement: strict parts: novnc: - source: build/ + source: https://github.com/novnc/noVNC/archive/v1.2.0.tar.gz plugin: dump stage-packages: - - websockify - bash - jq - - python-numpy + - python3-numpy + + websockify: + source: https://github.com/novnc/websockify/archive/v0.9.0.tar.gz + plugin: python + stage-packages: - python3-numpy hooks: @@ -28,9 +32,9 @@ hooks: apps: novnc: - command: ./launch.sh + command: utils/launch.sh plugs: [network, network-bind] novncsvc: - command: ./svc_wrapper.sh + command: snap/local/svc_wrapper.sh daemon: forking plugs: [network, network-bind]