| |
@@ -0,0 +1,29 @@
|
| |
+ From 9f62259366e1652777fb88c91675c6c1aebbd38b Mon Sep 17 00:00:00 2001
|
| |
+ From: Lee Yarwood <lyarwood@redhat.com>
|
| |
+ Date: Tue, 9 Jul 2019 12:12:43 +0100
|
| |
+ Subject: [PATCH] launch.sh: Check for a local websockify directory
|
| |
+
|
| |
+ Previously launch.sh would check both for the existence of a local
|
| |
+ websockify file and /websockify/run file.
|
| |
+
|
| |
+ This initial check should really be for a local websockify directory
|
| |
+ as in packaged environments a file could very well be the actual
|
| |
+ executable leading to launch.sh incorrectly attempting to use a local
|
| |
+ version of websockify.
|
| |
+ ---
|
| |
+ utils/launch.sh | 2 +-
|
| |
+ 1 file changed, 1 insertion(+), 1 deletion(-)
|
| |
+
|
| |
+ diff --git a/utils/launch.sh b/utils/launch.sh
|
| |
+ index 162607e..2e5e68f 100755
|
| |
+ --- a/utils/launch.sh
|
| |
+ +++ b/utils/launch.sh
|
| |
+ @@ -117,7 +117,7 @@ else
|
| |
+ fi
|
| |
+
|
| |
+ # try to find websockify (prefer local, try global, then download local)
|
| |
+ -if [[ -e ${HERE}/websockify ]]; then
|
| |
+ +if [[ -d ${HERE}/websockify ]]; then
|
| |
+ WEBSOCKIFY=${HERE}/websockify/run
|
| |
+
|
| |
+ if [[ ! -x $WEBSOCKIFY ]]; then
|
| |
Changelog:
- launch.sh: Check for a local websockify directory