Merge branch 'master' of ralfj.de:saartuer
authorConstantin Berhard <constantin@exxxtremesys.lu>
Mon, 14 Oct 2013 19:01:46 +0000 (21:01 +0200)
committerConstantin Berhard <constantin@exxxtremesys.lu>
Mon, 14 Oct 2013 19:01:46 +0000 (21:01 +0200)
1  2 
tyshell

diff --combined tyshell
index 8d7070a06a8874bef7fe4660f86f79133cf7ea83,6faaba8908542c955d7ba4eb855d306bdd04923e..9f327258fd21c1f2b8c05e4d09971e2d04165313
+++ b/tyshell
@@@ -5,8 -5,6 +5,8 @@@ import shle
  import sys
  import subprocess
  import socket
 +import pwd
 +import grp
  
  tuerSock = "/run/tuer.sock"
  
@@@ -35,9 -33,9 +35,9 @@@ 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.settimeout(60.0)
                s.send(cmd.encode())
-               data = s.recv(4)
+               data = s.recv(256)
                s.close()
                print(data.decode('utf-8'))
        return run
@@@ -46,18 -44,12 +46,18 @@@ def exitcmd(c)
        print("Bye")
        return True
  
 +def whocmd(c):
 +      for n in grp.getgrnam("tuer").gr_mem:
 +              p = pwd.getpwnam(n)
 +              print (p.pw_name, " - ", p.pw_gecos)
 +
  commands = {
        'exit': exitcmd,
        'help': helpcmd,
        'open': sendcmd(tuerSock, 'unlock'),
        'unlock': sendcmd(tuerSock, 'unlock'),
        'buzz': sendcmd(tuerSock, 'buzz'),
 +      'who': whocmd,
  }
  
  def complete_command(cmd):