Merge branch 'master' of ralfj.de:saartuer

diff --combined tyshell
index c35ec0ebbe9da65439d6411246ceeecff076ebce,f8627d214cf05c29f6d5cad27ee92a1d0d5f76fd..708ac5035cc5978fdd32855549b8bff52bc4623d
--- 1/tyshell
--- 2/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'''