Explain the prefix stuff a bit more
authorRalf Jung <post@ralfj.de>
Wed, 2 Oct 2013 17:08:46 +0000 (19:08 +0200)
committerRalf Jung <post@ralfj.de>
Wed, 2 Oct 2013 17:08:46 +0000 (19:08 +0200)
tyshell

diff --git a/tyshell b/tyshell
index 0bc3aaeb63e18fed3df141843ed8b2c8cd03d217..4429c354a2102fbef3d0a75d937e3668921b3bc4 100755 (executable)
--- a/tyshell
+++ b/tyshell
@@ -67,7 +67,7 @@ while True:
        if command[0] in commands: # needed in case a complete command is a prefix of another one
                cmdoptions = [command[0]]
        else:
        if command[0] in commands: # needed in case a complete command is a prefix of another one
                cmdoptions = [command[0]]
        else:
-               cmdoptions = list(filter(lambda x: command[0] == x[:len(command[0])],commands.keys()))
+               cmdoptions = list(filter(lambda x: command[0].startswith(x), commands.keys()))
        if len(cmdoptions) == 0: # no commands fit prefix
                print("Command %s not found. Use help." % command[0])
        elif len(cmdoptions) == 1: # exactly one command fits (prefix)
        if len(cmdoptions) == 0: # no commands fit prefix
                print("Command %s not found. Use help." % command[0])
        elif len(cmdoptions) == 1: # exactly one command fits (prefix)
@@ -76,6 +76,7 @@ while True:
                except Exception as e:
                        print("Error while executing %s: %s" % (command[0], str(e)))
        else: # multiple commands fit the prefix
                except Exception as e:
                        print("Error while executing %s: %s" % (command[0], str(e)))
        else: # multiple commands fit the prefix
+               print("Ambiguous command prefix, please choose one of the following:")
                print("\t", " ".join(cmdoptions))
                # TODO: put current "command[0]" into the shell for the next command, but such that it is deletable with backspace
 
                print("\t", " ".join(cmdoptions))
                # TODO: put current "command[0]" into the shell for the next command, but such that it is deletable with backspace