crabapples
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 69259cef8a into 0242c03280

This commit is contained in:
neil 2017-09-28 13:08:14 +00:00 committed by GitHub
parent 0242c03280 69259cef8a
commit 65fb9634c6
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/launch.sh
View File

@ -30,12 +30,10 @@ usage() {
NAME="$(basename $0)" NAME="$(basename $0)"
REAL_NAME="$(readlink -f $0)" REAL_NAME="$(readlink -f $0)"
HERE="$(cd "$(dirname "$REAL_NAME")" && pwd)" HERE="$(cd "$(dirname "$REAL_NAME")" && pwd)"
PORT="6080" PORT="${PORT:-6080}"
VNC_DEST="localhost:5900" VNC_DEST="${VNC_DEST:-localhost:5900}"
CERT=""
WEB=""
proxy_pid="" proxy_pid=""
SSLONLY=""
die() { die() {
echo "$*" echo "$*"
@ -142,7 +140,7 @@ fi
echo "Starting webserver and WebSockets proxy on port ${PORT}" echo "Starting webserver and WebSockets proxy on port ${PORT}"
#${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} & #${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
${WEBSOCKIFY} ${SSLONLY} --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} & ${WEBSOCKIFY} ${SSLONLY:+--ssl-only} --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
proxy_pid="$!" proxy_pid="$!"
sleep 1 sleep 1
if ! ps -p ${proxy_pid} >/dev/null; then if ! ps -p ${proxy_pid} >/dev/null; then