While we're at it, when echoing output from shell.run(), echo the command that's running _before_ executing it instead of after so the user can actually see what's going on instead of getting confused by the ordering of the output after the fact.

Author: gwynne

utils/swift_build_support/swift_build_support/shell.py

@@ -213,8 +213,10 @@ def run(*args, **kwargs):
     echo_output = kwargs.pop('echo', False)
     dry_run = kwargs.pop('dry_run', False)
     env = kwargs.get('env', None)
-    if dry_run:
+    if dry_run or echo_output:
+        print(repo_path)
         _echo_command(dry_run, *args, env=env)
+    if dry_run:
         return(None, 0, args)
 
     my_pipe = subprocess.Popen(
@@ -225,8 +227,6 @@ def run(*args, **kwargs):
     if lock:
         lock.acquire()
     if echo_output:
-        print(repo_path)
-        _echo_command(dry_run, *args, env=env)
         if stdout:
             print(stdout, end="")
         if stderr: