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