wok-next view novnc/stuff/patches/launch.sh.patch @ rev 20978
Small improvements
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu Sep 27 01:34:11 2018 +0300 (2018-09-27) |
| parents | |
| children |
line source
1 --- a/utils/launch.sh
2 +++ b/utils/launch.sh
3 @@ -1,4 +1,4 @@
4 -#!/usr/bin/env bash
5 +#!/bin/sh
7 # Copyright 2016 Joel Martin
8 # Copyright 2016 Solly Ross
9 @@ -110,42 +110,11 @@
10 echo "Warning: could not find self.pem"
11 fi
13 -# try to find websockify (prefer local, try global, then download local)
14 -if [[ -e ${HERE}/websockify ]]; then
15 - WEBSOCKIFY=${HERE}/websockify/run
16 -
17 - if [[ ! -x $WEBSOCKIFY ]]; then
18 - echo "The path ${HERE}/websockify exists, but $WEBSOCKIFY either does not exist or is not executable."
19 - echo "If you intended to use an installed websockify package, please remove ${HERE}/websockify."
20 - exit 1
21 - fi
22 -
23 - echo "Using local websockify at $WEBSOCKIFY"
24 -else
25 - WEBSOCKIFY=$(which websockify 2>/dev/null)
26 -
27 - if [[ $? -ne 0 ]]; then
28 - echo "No installed websockify, attempting to clone websockify..."
29 - WEBSOCKIFY=${HERE}/websockify/run
30 - git clone https://github.com/novnc/websockify ${HERE}/websockify
31 -
32 - if [[ ! -e $WEBSOCKIFY ]]; then
33 - echo "Unable to locate ${HERE}/websockify/run after downloading"
34 - exit 1
35 - fi
36 -
37 - echo "Using local websockify at $WEBSOCKIFY"
38 - else
39 - echo "Using installed websockify at $WEBSOCKIFY"
40 - fi
41 -fi
42 -
43 echo "Starting webserver and WebSockets proxy on port ${PORT}"
44 -#${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
45 -${WEBSOCKIFY} ${SSLONLY} --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
46 +${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
47 proxy_pid="$!"
48 sleep 1
49 -if ! ps -p ${proxy_pid} >/dev/null; then
50 +if [ -z "$proxy_pid" ] || ! ps -o pid= | grep -qw ${proxy_pid}; then
51 proxy_pid=
52 echo "Failed to start WebSockets proxy"
53 exit 1