#57: Add support for inline subprocess compat mode

src/rkd/api/contract.py

@@ -408,7 +408,7 @@ def py(self, code: str = '', become: str = None, capture: bool = False, script_p
         )
 
     def sh(self, cmd: str, capture: bool = False, verbose: bool = False, strict: bool = True,
-           env: dict = None) -> Union[str, None]:
+           env: dict = None, use_subprocess: bool = False) -> Union[str, None]:
         """Executes a shell script in bash. Throws exception on error.
         To capture output set capture=True
 

src/rkd/process.py

@@ -59,7 +59,7 @@ def __init__(self):
         self.has_exited = False
 
 
-def check_call(command: str, script_to_show: Optional[str] = ''):
+def check_call(command: str, script_to_show: Optional[str] = '', use_subprocess: bool = False):
     """
     Another implementation of subprocess.check_call(), in comparison - this method writes output directly to
     sys.stdout and sys.stderr, which makes output capturing possible
@@ -69,7 +69,7 @@ def check_call(command: str, script_to_show: Optional[str] = ''):
     :return:
     """
 
-    if os.getenv('RKD_COMPAT_SUBPROCESS') == 'true':
+    if os.getenv('RKD_COMPAT_SUBPROCESS') == 'true' or use_subprocess:
         subprocess.check_call(command, shell=True)
         return
 

src/rkd/taskutil.py

@@ -59,7 +59,7 @@ def get_rkd_binary():
         return sys.executable
 
     def sh(self, cmd: str, capture: bool = False, verbose: bool = False, strict: bool = True,
-           env: dict = None) -> Union[str, None]:
+           env: dict = None, use_subprocess: bool = False) -> Union[str, None]:
         """ Executes a shell script in bash. Throws exception on error.
             To capture output set capture=True
         """
@@ -98,7 +98,8 @@ def sh(self, cmd: str, capture: bool = False, verbose: bool = False, strict: boo
                 bash_temp_file.flush()
 
                 check_call('bash ' + bash_temp_file.name,
-                           script_to_show=original_cmd if not is_debug else bash_script)
+                           script_to_show=original_cmd if not is_debug else bash_script,
+                           use_subprocess=use_subprocess)
 
             return