From: Constantin Berhard <constantin@exxxtremesys.lu>
Date: Sun, 20 Oct 2013 02:00:46 +0000 (+0200)
Subject: Merge branch 'master' of ralfj.de:saartuer
X-Git-Url: https://git.ralfj.de/saartuer.git/commitdiff_plain/f821d08610f37224ff13df938715da4438592907?ds=inline;hp=-c

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

f821d08610f37224ff13df938715da4438592907
diff --combined tyshell
index c35ec0e,f8627d2..708ac50
--- a/tyshell
+++ b/tyshell
@@@ -32,7 -32,7 +32,7 @@@ def extcmd(cmd)
  
  def sendcmd(addr, cmd):
  	def run(c):
- 		print("Running %s..." % (cmd))
+ 		print("206 Sending command %s..." % (cmd))
  		s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
  		s.connect(addr)
  		s.settimeout(60.0)
@@@ -51,21 -51,14 +51,21 @@@ def whocmd(c)
  		p = pwd.getpwnam(n)
  		print (p.pw_name, " - ", p.pw_gecos)
  
 -commands = {
 +def alias (cmds, aliases):
 +	for newname, oldname in aliases.items():
 +		cmds[newname] = cmds[oldname]
 +	return cmds
 +
 +commands = alias({
  	'exit': exitcmd,
  	'help': helpcmd,
  	'open': sendcmd(tuerSock, 'unlock'),
 -	'unlock': sendcmd(tuerSock, 'unlock'),
  	'buzz': sendcmd(tuerSock, 'buzz'),
  	'who': whocmd,
 -}
 +},{
 +	# aliases
 +	'unlock': 'open',
 +})
  
  def complete_command(cmd):
  	'''returns a list of commands (as strings) starting with cmd'''