some changes

xonsh/procs/linux.py

@@ -2,6 +2,7 @@
 import os
 import io
 import sys
+import time
 import select
 import socket
 import argparse
@@ -25,6 +26,7 @@ def _is_port_open(port):
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         try:
             s.bind(("127.0.0.1", port))
+            #s.bind(("localhost", port))
         except socket.error as e:
             return False
     return True
@@ -42,15 +44,16 @@ def _find_next_open_port():
 def serve_pty_command(command):
     """Starts up a PTY server for a specific command."""
     port = _find_next_open_port()
-    os.spawn(os.P_NO_WAIT, sys.execuatble, PTY_SERVER_PATH, port, command)
+    os.spawnl(os.P_NOWAIT, sys.executable, PTY_SERVER_PATH, port, *command)
     return port
 
 
 class PTY:
-    def __init__(self, slave=0, pid=os.getpid()):
+    def __init__(self):
         # open our controlling PTY
-        ptylink = os.readlink(f"/proc/{pid}/fd/{slave}")
-        print(ptylink)
+        child = 0
+        pid = os.getpid()
+        ptylink = os.readlink(f"/proc/{pid}/fd/{child}")
         self.pty = pty = io.open(ptylink, "rb+", buffering=0)
 
         # store our old termios settings so we can restore after
@@ -96,20 +99,25 @@ class PTY:
 
 
 class PopenPTYClient:
-    def __init__(self, addr, bind=False):
+    def __init__(self, args, bind=False, **kwargs):
+        port = serve_pty_command(args)
+        time.sleep(1)
         self.bind = bind
-        self.addr = addr
+        self.addr = ("127.0.0.1", port)
+        #self.addr = ("localhost", port)
 
         if self.bind:
             self.sock = socket.socket()
             self.sock.bind(self.addr)
             self.sock.listen(5)
 
-    def handle(self, addr=None):
-        addr = addr or self.addr
+        self.handle()
+
+    def handle(self):
         if self.bind:
             sock, addr = self.sock.accept()
         else:
+            addr = self.addr
             sock = socket.socket()
             sock.connect(addr)
 

xonsh/procs/pty_server.py

@@ -11,7 +11,8 @@ import socket
 
 def spawn(port, argv):
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    s.bind(('', port))
+    #s.bind(('', port))
+    s.bind(('127.0.0.1', port))
     s.listen(1)
     (rem, addr) = s.accept()
     os.dup2(rem.fileno(),0)
@@ -25,6 +26,8 @@ def main(args=None):
     args = sys.argv if args is None else args
     port = int(args[1])
     argv = args[2:]
+    print(port)
+    print(argv)
     spawn(port, argv)
 
 

xonsh/procs/specs.py

@@ -19,6 +19,7 @@ import xonsh.lazyimps as xli
 import xonsh.jobs as xj
 
 from xonsh.procs.readers import ConsoleParallelReader
+from xonsh.procs.linux import PopenPTYClient
 from xonsh.procs.proxies import ProcProxy, ProcProxyThread
 from xonsh.procs.pipelines import (
     pause_call_resume,
@@ -713,7 +714,7 @@ def _update_last_spec(last):
     else:
         if captured:
             # update this when we have PTY server/client
-            last.cls = subprocess.Popen
+            last.cls = PopenPTYClient if xp.ON_LINUX else subprocess.Popen
             if captured == "object" or captured == "hiddenobject":
                 # CommandPipeline objects should not pipe stdout, stderr
                 return