From: Joel Martin <github@martintribe.org>
Date: Tue, 21 Dec 2010 16:17:43 +0000 (-0600)
Subject: utils/launch.sh: find top web dir (with vnc.html).
X-Git-Tag: v1.0.0~703
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0f7f146f200788c6046404016694fc5aec778a0a;p=mirror_novnc.git

utils/launch.sh: find top web dir (with vnc.html).
---

diff --git a/utils/launch.sh b/utils/launch.sh
index aeb875c..1ee7d15 100755
--- a/utils/launch.sh
+++ b/utils/launch.sh
@@ -73,6 +73,18 @@ netstat -ltn | grep -qs "${PROXY_PORT}.*LISTEN" \
 
 trap "cleanup" TERM QUIT INT EXIT
 
+# Find vnc.html
+if [ -e "$(pwd)/vnc.html" ]; then
+    TOP=$(pwd)
+elif [ -e "${HERE}/../vnc.html" ]; then
+    TOP=${HERE}/../
+elif [ -e "${HERE}/vnc.html" ]; then
+    TOP=${HERE}
+else
+    die "Could not find vnc.html"
+fi
+cd ${TOP}
+
 echo "Starting webserver on port ${WEB_PORT}"
 ${HERE}/web.py ${WEB_PORT} >/dev/null &
 web_pid="$!"