From: Constantin Berhard <constantin@exxxtremesys.lu>
Date: Mon, 14 Oct 2013 19:01:46 +0000 (+0200)
Subject: Merge branch 'master' of ralfj.de:saartuer
X-Git-Url: https://git.ralfj.de/saartuer.git/commitdiff_plain/4f9482a7c46d5930b309a5796c39f81efa3989ae?ds=sidebyside;hp=-c

Merge branch 'master' of ralfj.de:saartuer
---

4f9482a7c46d5930b309a5796c39f81efa3989ae
diff --combined tyshell
index 8d7070a,6faaba8..9f32725
--- a/tyshell
+++ 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):