Use export instead of env to apply environment variables.

This means they properly carry to sub-commands/etc. The env is still
reset between operation calls as expected, so this is effectively fixes
a bug in the expected behaviour.

Author: Fizzadar

pyinfra/api/connectors/util.py

@@ -235,7 +235,7 @@ def make_unix_command(
             '{0}={1}'.format(key, value)
             for key, value in six.iteritems(env)
         ])
-        command = StringCommand('env', env_string, command)
+        command = StringCommand('export', env_string, '&&', command)
 
     if chdir:
         command = StringCommand('cd', chdir, '&&', command)

tests/test_connectors/test_util.py

@@ -103,8 +103,8 @@ def test_command_env(self):
             'anotherkey': 'anothervalue',
         })
         assert command.get_raw_value() in [
-            "sh -c 'env key=value anotherkey=anothervalue uptime'",
-            "sh -c 'env anotherkey=anothervalue key=value uptime'",
+            "sh -c 'export key=value anotherkey=anothervalue && uptime'",
+            "sh -c 'export anotherkey=anothervalue key=value && uptime'",
         ]
 
     def test_command_chdir(self):
@@ -129,5 +129,5 @@ def test_mixed_command(self):
         assert command.get_raw_value() == (
             'sudo -H -n -E -u root '  # sudo bit
             'su pyinfra -c '  # su bit
-            "'bash -c '\"'\"'cd /opt/somedir && env key=value echo hi'\"'\"''"  # command bit
+            "'bash -c '\"'\"'cd /opt/somedir && export key=value && echo hi'\"'\"''"  # command bit
         )