X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/6e7d90d419547705cb125adc7fe3626d9dc0fd49..83d646a505bed8c75eef15855da7046e5854106d:/tyshell

diff --git a/tyshell b/tyshell
index 34ef515..9350e12 100755
--- a/tyshell
+++ b/tyshell
@@ -9,16 +9,17 @@ import socket
 tuerSock = "/run/tuer.sock"
 
 # use a histfile
-histfile = os.path.join(os.path.expanduser("~"), ".pyshellhist")
+histfile = os.path.join(os.path.expanduser("~"), ".tyshellhist")
 try:
     readline.read_history_file(histfile)
 except IOError:
     pass
 import atexit
 atexit.register(readline.write_history_file, histfile)
+atexit.register(print, "Bye")
 
 # available commands
-def help(c):
+def helpcmd(c):
 	print("Available commands: %s" % ", ".join(sorted(commands.keys())))
 
 def extcmd(cmd):
@@ -41,9 +42,12 @@ def sendcmd(addr, cmd):
 			print("Received unexpected answer %s" % str(data))
 	return run
 
+def exitcmd(c):
+	sys.exit(0)
+
 commands = {
-	'exit': None, # catched below, quits the loop
-	'help': help,
+	'exit': exitcmd,
+	'help': helpcmd,
 	'open': sendcmd(tuerSock, 'open'),
 	'close': sendcmd(tuerSock, 'close'),
 	'buzz': sendcmd(tuerSock, 'buzz'),
@@ -60,13 +64,11 @@ while True:
 	command = shlex.split(command)
 	if not len(command): continue
 	# execute command
-	if command[0] == "exit":
-		break
-	elif command[0] in commands:
+	if command[0] in commands:
 		try:
 			commands[command[0]](command)
 		except Exception as e:
 			print("Error while executing %s: %s" % (command[0], str(e)))
 	else:
 		print("Command %s not found. Use help." % command[0])
-print("Bye")
+