Use eval to handle any valid bash script and correctly propagate errors

2733284198 · Jun 18, 2019 · f8dc4d1 · f8dc4d1
1 parent 2657b41
commit f8dc4d1
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/functions/__bass.py b/functions/__bass.py
@@ -36,12 +36,11 @@ def gen_script():
     pipe_r, pipe_w = os.pipe()
     if sys.version_info >= (3, 4):
       os.set_inheritable(pipe_w, True)
-    command = '{}\n({}; alias) >&{}'.format(
-        ' '.join(sys.argv[1:]).rstrip().rstrip(';'),
+    command = 'eval $1 && ({}; alias) >&{}'.format(
         env_reader,
         pipe_w
     )
-    args = [BASH, '-c', command]
+    args = [BASH, '-c', command, 'bass', ' '.join(sys.argv[1:])]
     subprocess.check_call(args, universal_newlines=True, close_fds=False)
     os.close(pipe_w)
     with os.fdopen(pipe_r) as f: