Expanded do_shell parsing of command

1 files changed, 14 insertions, 1 deletions

diff --git a/cmd2.py b/cmd2.py
index fb3e0f1f..a8171603 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -2611,7 +2611,20 @@ Usage:  Usage: unalias [-a] name [name ...]
         """Execute a command as if at the OS prompt.
 
     Usage:  shell <command> [arguments]"""
-        proc = subprocess.Popen(command, stdout=self.stdout, shell=True)
+
+        try:
+            tokens = shlex.split(command, posix=POSIX_SHLEX)
+        except ValueError as err:
+            self.perror(err, traceback_war=False)
+
+        for index, token in enumerate(tokens):
+            tokens[index] = strip_quotes(tokens[index])
+            tokens[index] = os.path.expandvars(tokens[index])
+            tokens[index] = os.path.expanduser(tokens[index])
+            tokens[index] = shlex.quote(tokens[index])
+
+        expanded_command = ' '.join(tokens)
+        proc = subprocess.Popen(expanded_command, stdout=self.stdout, shell=True)
         proc.communicate()
 
     @staticmethod