start implementing the new all-great tuerd

[saartuer.git] / tyshell

diff --git a/tyshell b/tyshell
index 4429c354a2102fbef3d0a75d937e3668921b3bc4..22809262fd4598b150428e7d8a4ea0fe1aef54e2 100755 (executable)
--- a/tyshell
+++ b/tyshell
@@ -16,7 +16,6 @@ except IOError:
     pass
 import atexit
 atexit.register(readline.write_history_file, histfile)
-atexit.register(print, "Bye")
 
 # available commands
 def helpcmd(c):
@@ -34,16 +33,16 @@ def sendcmd(addr, cmd):
                print("Running %s..." % (cmd))
                s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
                s.connect(addr)
+               s.settimeout(10.0)
                s.send(cmd.encode())
                data = s.recv(4)
                s.close()
-               print("...done")
-               if data != b'1':
-                       print("Received unexpected answer %s" % str(data))
+               print(data.decode('utf-8'))
        return run
 
 def exitcmd(c):
-       sys.exit(0)
+       print("Bye")
+       return True
 
 commands = {
        'exit': exitcmd,
@@ -68,11 +67,13 @@ while True:
                cmdoptions = [command[0]]
        else:
                cmdoptions = list(filter(lambda x: command[0].startswith(x), commands.keys()))
+       # check how many we found
        if len(cmdoptions) == 0: # no commands fit prefix
                print("Command %s not found. Use help." % command[0])
        elif len(cmdoptions) == 1: # exactly one command fits (prefix)
                try:
-                       commands[cmdoptions[0]](command)
+                       res = commands[cmdoptions[0]](command)
+                       if res: break
                except Exception as e:
                        print("Error while executing %s: %s" % (command[0], str(e)))
        else: # multiple commands fit the prefix