Commit 65e81d51 authored by Brian May's avatar Brian May

Try Python3.5 by default.

Python 3.0, 3.1, 3.2, and 3.4 not supported however.
parent 43084eb4
#!/bin/sh #!/bin/sh
if python3 -V 2>/dev/null; then if python3.5 -V 2>/dev/null; then
exec python3 -m "sshuttle" "$@" exec python3 -m "sshuttle" "$@"
else else
exec python -m "sshuttle" "$@" exec python -m "sshuttle" "$@"
......
...@@ -107,7 +107,7 @@ def connect(ssh_cmd, rhostport, python, stderr, options): ...@@ -107,7 +107,7 @@ def connect(ssh_cmd, rhostport, python, stderr, options):
if python: if python:
pycmd = "'%s' -c '%s'" % (python, pyscript) pycmd = "'%s' -c '%s'" % (python, pyscript)
else: else:
pycmd = ("P=python2; $P -V 2>/dev/null || P=python; " pycmd = ("P=python3.5; $P -V 2>/dev/null || P=python; "
"exec \"$P\" -c '%s'") % pyscript "exec \"$P\" -c '%s'") % pyscript
argv = (sshl + argv = (sshl +
portl + portl +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment