Fix sudo in popen_python code

diff --git a/src/nepi/util/server.py b/src/nepi/util/server.py
index 7906712..7a71eef 100644 (file)
--- a/src/nepi/util/server.py
+++ b/src/nepi/util/server.py
@@ -848,8 +848,6 @@ def popen_python(python_code,
 
     shell = False
     cmd = ""
 
     shell = False
     cmd = ""

-    if sudo:
-        cmd +="sudo "

     if python_path:
         python_path.replace("'", r"'\''")
         cmd = """PYTHONPATH="$PYTHONPATH":'%s' """ % python_path
     if python_path:
         python_path.replace("'", r"'\''")
         cmd = """PYTHONPATH="$PYTHONPATH":'%s' """ % python_path


@@ -867,6 +865,12 @@ def popen_python(python_code,
         repr(os.path.dirname(os.path.dirname(nepi.__file__))).replace("'",'"'),
     )
 
         repr(os.path.dirname(os.path.dirname(nepi.__file__))).replace("'",'"'),
     )
 

+    if sudo:
+        if ';' in cmd:
+            cmd = "sudo bash -c " + shell_escape(cmd)
+        else:
+            cmd = "sudo " + cmd
+

     if communication == DC.ACCESS_SSH:
         tmp_known_hosts = None
         args = ['ssh',
     if communication == DC.ACCESS_SSH:
         tmp_known_hosts = None
         args = ['ssh',


@@ -887,7 +891,7 @@ def popen_python(python_code,
                 server_key, host, port, args)
         args.append(cmd)
     else:
                 server_key, host, port, args)
         args.append(cmd)
     else:

-        args = [cmd]
+        args = cmd

         shell = True
 
     # connects to the remote host and starts a remote
         shell = True
 
     # connects to the remote host and starts a remote