01/01: gnu: sshuttle: Rely on $PATH to find a POSIX sh.

[Tobias Geerinckx-Rice]

nckx pushed a commit to branch master
in repository guix.

commit 0e2d3ce20e7bd71aaad5baa6b977b9684216b66e
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Sun Sep 30 21:12:06 2018 +0200

    gnu: sshuttle: Rely on $PATH to find a POSIX sh.
    
    This fixes a regression introduced in commit
    c32863e094d3489d2e08ccb3188988d7c6410976, where the sshuttle client
    will try to invoke its own /gnu/store/.../bin/sh on the server.
    
    Rely on $PATH instead of regressing to upstream's hard-coded /bin/sh.
    
    * gnu/packages/vpn.scm (sshuttle)[arguments]: SUBSTITUTE* "sh" for
    "/bin/sh".
---
 gnu/packages/vpn.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index de5df50..9b1f26a 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -355,8 +355,7 @@ private network between hosts on the internet.")
              (substitute* "sshuttle/client.py"
                (("/usr/bin/env") (which "env")))
              (substitute* "sshuttle/ssh.py"
-               ;; Perhaps this is unreachable, but don't let's take risks.
-               (("/bin/sh") (which "sh")))
+               (("/bin/sh") "sh"))
              #t)))))
     (native-inputs
      `(("python-setuptools-scm" ,python-setuptools-scm)