Commit Graph

3 Commits

Author SHA1 Message Date
唐飞雄 (twitter: @tangfx) b6bebb46ca Revert "Merge from upstream" 2017-08-04 18:44:41 -07:00
Solly Ross 6f5148648b Remove local copies of websockify
This commit removes local copies of websockify.
Instead `utils/launch.sh` performs the following logic:

If `utils/websockify` exists, use `utils/websockify/run` (if the latter
does not exist, or is not executable, fail, since this is probably a
mistake).

Otherwise, check to see if websockify is installed somewhere (try
`which websockify`).  If it is, use that.  Otherwise, clone
websockify from github, and tell git to ignore that directory.

Packaged versions of noVNC should simply list websockify as a
requirement.  The debian packaging has been updated to reflect
this.

Closes #433
2015-02-16 17:09:58 -05:00
Joel Martin f66bcda31b Add websockify.py symlink for Windows. 2012-01-05 11:55:56 -06:00