maybe fix

Author: ecraig12345

packages/beachball/src/__fixtures__/registry.ts

@@ -150,11 +150,8 @@ export class Registry {
 
   /** Run `npm logout` on the fake registry */
   public async logout(): Promise<void> {
-    if (!this.isLoggedIn) {
-      return;
-    }
-
-    // Conservatively set to false even if it fails partway (logging in again is harmless)
+    // Conservatively set to false even if it fails partway (logging in again is harmless).
+    // Also go ahead and log out even if not flagged as logged in since it could be out of sync.
     this.isLoggedIn = false;
     try {
       const registry = this.getUrl();

packages/beachball/src/__functional__/packageManager/packagePublish.test.ts

@@ -184,11 +184,12 @@ describe('packagePublish', () => {
       expect(logs2ndTry).toMatch(`${testSpec} already exists in the registry`);
     });
 
-    // TODO: remove it.skip once node version is upgraded (this test doesn't work with npm 6 because
+    // TODO: remove condition once node version is upgraded (this test doesn't work with npm 6 because
     // that version seems to allow truly anonymous publishing with verdaccio)
-    // eslint-disable-next-line no-restricted-properties
-    const itNotNpm6 = npmVersion.startsWith('6') ? it.skip : it;
-    itNotNpm6('handles auth error and does not retry', async () => {
+    it('handles auth error and does not retry', async () => {
+      if (npmVersion.startsWith('6.')) {
+        return;
+      }
       await registry.logout();
 
       const testPackageInfo = getTestPackageInfo();

packages/beachball/src/packageManager/packageManager.ts

@@ -19,7 +19,9 @@ export async function packageManager(
     const result = await execa(manager, args, {
       ...options,
       // This is required for Windows due to https://nodejs.org/en/blog/vulnerability/april-2024-security-releases-2
-      shell: true,
+      // but only provide it on Windows because it breaks oddly-named environment variables
+      // such as npm_config_//someRegistry/:_authToken on Linux...
+      ...(process.platform === 'win32' && { shell: true }),
     });
     return {
       ...result,