JavaScriptExpert
diff --git a/‎apps/rush-lib/src/utilities/AsyncRecycler.ts‎
Lines changed: 38 additions & 18 deletions b/‎apps/rush-lib/src/utilities/AsyncRecycler.ts‎
Lines changed: 38 additions & 18 deletions
diff --git a/‎common/changes/@microsoft/rush/pgonzal-rush-mac-recycler_2018-04-17-00-54.json‎
Lines changed: 11 additions & 0 deletions b/‎common/changes/@microsoft/rush/pgonzal-rush-mac-recycler_2018-04-17-00-54.json‎
Lines changed: 11 additions & 0 deletions
@@ -95,33 +95,53 @@ export default class AsyncRecycler {
     }
 
     // Asynchronously delete the folder contents.
-    const recyclerFolderContents: string = path.join(this.recyclerFolder, '*');
-
-    const windowsTrimmedRecyclerFolder: string = this.recyclerFolder.match(/\\$/)
-      ? this.recyclerFolder.substring(0, this.recyclerFolder.length - 1)
-      : this.recyclerFolder;
-    const command: string = os.platform() === 'win32'
-      // Windows
-      ? 'cmd.exe'
-      // Assume 'NIX or Darwin
-      : 'rm';
-
-    const args: string[] = os.platform() === 'win32'
-      // Windows
-      ? [
+    let command: string;
+    let args: string[];
+
+    if (os.platform() === 'win32') {
+      const recyclerFolderWildcard: string = path.join(this.recyclerFolder, '*');
+
+      const windowsTrimmedRecyclerFolder: string = this.recyclerFolder.match(/\\$/)
+        ? this.recyclerFolder.substring(0, this.recyclerFolder.length - 1)
+        : this.recyclerFolder;
+      command = 'cmd.exe';
+
+      args = [
         '/c',
-        `FOR /F %f IN ('dir /B \\\\?\\${recyclerFolderContents}') `
+        `FOR /F %f IN ('dir /B \\\\?\\${recyclerFolderWildcard}') `
           + `DO rd /S /Q \\\\?\\${windowsTrimmedRecyclerFolder}\\%f`
-      ]
-      // Assume 'NIX or Darwin
-      : ['-rf', `"${recyclerFolderContents}"`];
+      ];
+    } else {
+      command = 'rm';
+      args = [ '-rf' ];
+
+      let pathCount: number = 0;
+
+      // child_process.spawn() doesn't expand wildcards.  To be safe, we will do it manually
+      // rather than rely on an unknown shell.
+      for (const filename of fsx.readdirSync(this.recyclerFolder)) {
+        // The "." and ".." are supposed to be excluded, but let's be safe
+        if (filename !== '.' && filename !== '..') {
+          args.push(path.join(this.recyclerFolder, filename));
+          ++pathCount;
+        }
+      }
+
+      if (pathCount === 0) {
+        // Nothing to do
+        return;
+      }
+    }
 
     const options: child_process.SpawnOptions = {
       detached: true,
+      // The child won't stay alive unless we detach its stdio
       stdio: [ 'ignore', 'ignore', 'ignore' ]
     };
 
     const process: child_process.ChildProcess = child_process.spawn(command, args, options);
+
+    // The child won't stay alive unless we unlink it from the parent process
     process.unref();
   }
 
 
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Fix a problem where the \"rush-recycler\" folder was not getting cleaned on macOS",
+      "packageName": "@microsoft/rush",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "pgonzal@users.noreply.github.com"
+}