Merge 3b1fee6b91 into 33f83d1e1e
This commit is contained in:
commit
5f2876a7cc
|
|
@ -322,7 +322,7 @@ class WebSocketProxy(websockifyserver.WebSockifyServer):
|
||||||
# Last 3 timestamps command was run
|
# Last 3 timestamps command was run
|
||||||
self.wrap_times = [0, 0, 0]
|
self.wrap_times = [0, 0, 0]
|
||||||
|
|
||||||
if self.wrap_cmd:
|
if self.wrap_cmd and not self.unix_target:
|
||||||
wsdir = os.path.dirname(sys.argv[0])
|
wsdir = os.path.dirname(sys.argv[0])
|
||||||
rebinder_path = [os.path.join(wsdir, "..", "lib"),
|
rebinder_path = [os.path.join(wsdir, "..", "lib"),
|
||||||
os.path.join(wsdir, "..", "lib", "websockify"),
|
os.path.join(wsdir, "..", "lib", "websockify"),
|
||||||
|
|
@ -661,7 +661,7 @@ def websockify_init():
|
||||||
del opts.target_cfg
|
del opts.target_cfg
|
||||||
|
|
||||||
if sys.argv.count('--'):
|
if sys.argv.count('--'):
|
||||||
opts.wrap_cmd = args[1:]
|
opts.wrap_cmd = args if opts.unix_listen else args[1:]
|
||||||
else:
|
else:
|
||||||
opts.wrap_cmd = None
|
opts.wrap_cmd = None
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue