1 files changed, 11 insertions, 7 deletions
diff --git a/cmd2.py b/cmd2.py
index 7ce6e5c0..d2f26166 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -1578,14 +1578,18 @@ class Cmd(cmd.Cmd):
                 break
 
         i, n = 0, len(line)
-        while i < n and line[i] in self.identchars:
-            i += 1
-        command, arg = line[:i], line[i:].strip()
 
-        # Make sure there is a space between the command and args
-        # This can occur when a character not in self.identchars bumps against the command (ex: help@)
-        if len(command) > 0 and len(arg) > 0 and line[len(command)] != ' ':
-            line = line.replace(command, command + ' ', 1)
+        # If we are allowing shell commands, then allow any character in the command
+        if self.default_to_shell:
+            while i < n and line[i] != ' ':
+                i += 1
+
+        # Otherwise only allow those in identchars
+        else:
+            while i < n and line[i] in self.identchars:
+                i += 1
+
+        command, arg = line[:i], line[i:].strip()
 
         return command, arg, line