extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-03-01 08:41:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly call /bin/sh for compatibility with non POSIX shells.

Browse Source 
The fish shell doesn’t support ‘||’ and requires a ‘—python python’
workaround.  This change explicitly calls /bin/sh for the remote shell
commands.
This commit is contained in:
Andrew Gillham 2016-03-08 15:30:59 -08:00
parent 2b0d0065c7
commit 7875d1b97a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sshuttle/ssh.py
View File

@ -108,8 +108,8 @@ 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=python3.5; $P -V 2>/dev/null || P=python; " pycmd = ("exec /bin/sh -c \'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 +
[rhost, '--', pycmd]) [rhost, '--', pycmd])