Merge pull request #30 from tradebyte/fix-issue-subprocess-bash

Fix issue subprocess bash

README.md

@@ -101,7 +101,7 @@ Help:
 
 ## Limitations
 
-* It currently targets Ubuntu 16.04 only!
+* It currently targets Ubuntu only!
 * It needs more packages.
 * It needs testing.
 * It only supports 64bit systems.

paci/helpers/cmd_helper.py

@@ -9,7 +9,7 @@ def execute_shell_script(script, working_dir):
     """Execute a shell script."""
     st = os.stat(script)
     os.chmod(script, st.st_mode | stat.S_IEXEC)
-    subprocess.call(script, shell=False, cwd=working_dir)
+    subprocess.call(script, shell=True, cwd=working_dir)
 
 
 def set_script_variables(values):

paci/packages/cli_helper.py

@@ -30,7 +30,7 @@ def debug_execute(cmd, cwd=None):
     popen = subprocess.Popen(cmd,
                              stdout=subprocess.PIPE,
                              universal_newlines=True,
-                             shell=False,
+                             shell=True,
                              cwd=cwd)
     for stdout_line in iter(popen.stdout.readline, ""):
         yield stdout_line
@@ -56,25 +56,18 @@ def sh(cmd, cwd=None):
     True if the execution was successful but no output was given.
     The output of the command if it was successful and stdout wasn't empty.
     """
-    # We want to interpolate env variables before executing the command, because shell=False
-    # cannot handle these. Using shell=True is no option since it is a security risk.
-    if isinstance(cmd, list):
-        cmd_list = cmd
-    else:
-        cmd_list = cmd.split()
-    cmd_list = list(map(lambda x: os.path.expandvars(x), cmd_list))
 
     if DEBUG:
         stdout = ""
-        for path in debug_execute(cmd_list, cwd=cwd):
+        for path in debug_execute(cmd, cwd=cwd):
             print(path, end="")
             stdout += path
         if stdout:
             return stdout.rstrip()
         else:
             return False
     else:
-        executed_cmd = Shell(cmd_list, cwd=cwd)
+        executed_cmd = Shell(cmd, cwd=cwd)
         if executed_cmd.code == 0:
             if executed_cmd.stdout:
                 return str(executed_cmd)

paci/packages/shell.py

@@ -20,16 +20,8 @@ def __init__(self, *args, **kwargs):
         self.bash(*args, **kwargs)
 
     def bash(self, cmd, env=None, stdout=PIPE, stderr=PIPE, timeout=None, sync=True, cwd=None):
-        # We want to interpolate env variables before executing the command, because shell=False
-        # cannot handle these. Using shell=True is no option since it is a security risk.
-        if isinstance(cmd, list):
-            cmd_list = cmd
-        else:
-            cmd_list = cmd.split()
-        cmd_list = list(map(lambda x: os.path.expandvars(x), cmd_list))
-
         self.p = Popen(
-            cmd_list, shell=False, stdout=stdout, stdin=PIPE, stderr=stderr, env=env, cwd=cwd
+            cmd, shell=True, stdout=stdout, stdin=PIPE, stderr=stderr, env=env, cwd=cwd
         )
         if sync:
             self.sync(timeout)

requirements.txt

@@ -11,7 +11,7 @@ tinydb==3.2.2
 tabulate==0.7.7
 fuzzywuzzy==0.15.0
 python-Levenshtein==0.12.0
-halo==0.0.7
+halo==0.0.31
 termcolor==1.1.0
 easydict==1.7
-log_symbols==0.0.12
+log_symbols==0.0.14