Use the assigned file system rather than the local one when available

Author: abertelrud

Sources/Build/BuildOperation.swift

@@ -455,14 +455,14 @@ public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildS
                     // Allow access to the plugin's output directory as well as to the local temporary directory.
                     let sandboxProfile = SandboxProfile([
                         .writable(pluginResult.pluginOutputDirectory),
-                        .writable(localFileSystem.tempDirectory)])
+                        .writable(self.fileSystem.tempDirectory)])
                     commandLine = sandboxProfile.apply(to: commandLine)
                 }
 
                 // Pass `TMPDIR` in the environment, in addition to anything the plugin specifies, in case we have an
                 // override in our own environment.
                 var environment = command.configuration.environment
-                environment["TMPDIR"] = localFileSystem.tempDirectory.pathString
+                environment["TMPDIR"] = self.fileSystem.tempDirectory.pathString
 
                 // Run the command and wait for it to finish.
                 let processResult = try Process.popen(arguments: commandLine, environment: environment)

Sources/Build/LLBuildManifestBuilder.swift

@@ -624,13 +624,13 @@ extension LLBuildManifestBuilder {
                 if !self.disableSandboxForPluginCommands {
                     let sandboxProfile = SandboxProfile([
                         .writable(result.pluginOutputDirectory),
-                        .writable(localFileSystem.tempDirectory)])
+                        .writable(self.fileSystem.tempDirectory)])
                     commandLine = sandboxProfile.apply(to: commandLine)
                 }
                 // Pass `TMPDIR` in the environment, in addition to anything the plugin specifies, in case we have an
                 // override in our own environment.
                 var environment = command.configuration.environment
-                environment["TMPDIR"] = localFileSystem.tempDirectory.pathString
+                environment["TMPDIR"] = self.fileSystem.tempDirectory.pathString
 
                 manifest.addShellCmd(
                     name: displayName + "-" + ByteString(encodingAsUTF8: uniquedName).sha256Checksum,

Sources/Workspace/DefaultPluginScriptRunner.swift

@@ -396,7 +396,7 @@ public struct DefaultPluginScriptRunner: PluginScriptRunner, Cancellable {
             var sandbox = SandboxProfile()
 
             // Allow writing in the temporary directory (whether or not it's overridden by TMPDIR).
-            sandbox.pathAccessRules.append(.writable(localFileSystem.tempDirectory))
+            sandbox.pathAccessRules.append(.writable(self.fileSystem.tempDirectory))
 
             // But prevent writing in any read-only directories.
             sandbox.pathAccessRules.append(contentsOf: readOnlyDirectories.map{ .readonly($0) })
@@ -420,7 +420,7 @@ public struct DefaultPluginScriptRunner: PluginScriptRunner, Cancellable {
         // Pass `TMPDIR` in the environment, in addition to anything the plugin specifies. This lets us respect our own
         // override, and also makes sure that the plugin always knows what temporary directory we opened up for it.
         var environment = ProcessInfo.processInfo.environment
-        environment["TMPDIR"] = localFileSystem.tempDirectory.pathString
+        environment["TMPDIR"] = self.fileSystem.tempDirectory.pathString
         process.environment = environment
 
         // Set up a pipe for sending structured messages to the plugin on its stdin.