log

Author: voschezang

src/mash/io_util.py

@@ -208,11 +208,12 @@ def check_output(line: str) -> str:
     """Similar to subprocess.check_output, but with more detailed error messages
     """
     result = subprocess.run(line, capture_output=True, shell=True)
+    stdout = result.stdout.decode()
 
-    msg = result.stdout.decode(), result.stderr.decode()
+    msg = stdout, result.stderr.decode()
     assert result.returncode == 0, msg
 
-    return result.stdout.decode().rstrip('\n')
+    return stdout.rstrip('\n')
 
 
 @functools.lru_cache(maxsize=64)

src/mash/shell/shell.py

@@ -26,13 +26,9 @@
 {bold('Default Commands')}
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Run shell commands by prefixing them with `!`.
-E.g.
-    ./shell.py !echo abc; echo def # Bash
-
 Run multiple Python commands by separating each command with colons or newlines.
 E.g.
-    ./shell.py 'print abc; print def \n print ghi'
+    ./shell.py 'print abc; print def'
 
 {bold('Variables')}
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -57,15 +53,7 @@
 E.g.
 ```
     echo abc | ./shell.py print
-    ./shell.py print abc | echo
-```
-
-2. Within the dsl
-E.g.
-```
-    ./shell.py print abc # Python
     ./shell.py 'print abc | echo'
-    ./shell.py 'print abc |> print'
 ```
 """
 
@@ -121,7 +109,7 @@ def onecmd_inner(self, lines: str):
     def run_commands(self, ast: Node, prev_result='', run=False):
         if isinstance(ast, Term):
             return ast.run(prev_result, shell=self, lazy=not run)
-                # results = shell.run_commands(item, '', not lazy)
+            # results = shell.run_commands(item, '', not lazy)
 
         elif isinstance(ast, str):
             return self.run_commands(Term(ast), prev_result, run=run)
@@ -397,6 +385,7 @@ def setup(shell: Shell = None, functions: Dict[str, Function] = None, completion
         shell.load_session(io_util.parse_args.session)
 
     commands = ' '.join(io_util.parse_args.cmd + list(read_stdin()))
+    print('commands', commands)
     filename = io_util.parse_args.file
 
     return shell, commands, filename