From 24c014b506a7012539f380b85695c7e8c2ece8a9 Mon Sep 17 00:00:00 2001
From: John Britton <public@johndbritton.com>
Date: Thu, 29 Jun 2023 09:54:18 -0400
Subject: [PATCH] Fix single process logic in `rbenv-sync` and `nodenv-sync`

---
 Library/Homebrew/cmd/nodenv-sync.rb | 28 +++++++++++++++-------------
 Library/Homebrew/cmd/rbenv-sync.rb  | 28 +++++++++++++++-------------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/Library/Homebrew/cmd/nodenv-sync.rb b/Library/Homebrew/cmd/nodenv-sync.rb
index d461e810b8..647f2ebf45 100755
--- a/Library/Homebrew/cmd/nodenv-sync.rb
+++ b/Library/Homebrew/cmd/nodenv-sync.rb
@@ -29,22 +29,24 @@ module Homebrew
     nodenv_sync_running = dot_nodenv/".nodenv_sync_running"
     return if nodenv_sync_running.exist?
 
-    nodenv_versions = dot_nodenv/"versions"
-    nodenv_versions.mkpath
-    FileUtils.touch nodenv_sync_running
+    begin
+      nodenv_versions = dot_nodenv/"versions"
+      nodenv_versions.mkpath
+      FileUtils.touch nodenv_sync_running
 
-    nodenv_sync_args.parse
+      nodenv_sync_args.parse
 
-    HOMEBREW_CELLAR.glob("node{,@*}")
-                   .flat_map(&:children)
-                   .each { |path| link_nodenv_versions(path, nodenv_versions) }
+      HOMEBREW_CELLAR.glob("node{,@*}")
+                     .flat_map(&:children)
+                     .each { |path| link_nodenv_versions(path, nodenv_versions) }
 
-    nodenv_versions.children
-                   .select(&:symlink?)
-                   .reject(&:exist?)
-                   .each { |path| FileUtils.rm_f path }
-  ensure
-    nodenv_sync_running.unlink if nodenv_sync_running.exist?
+      nodenv_versions.children
+                     .select(&:symlink?)
+                     .reject(&:exist?)
+                     .each { |path| FileUtils.rm_f path }
+    ensure
+      nodenv_sync_running.unlink if nodenv_sync_running.exist?
+    end
   end
 
   sig { params(path: Pathname, nodenv_versions: Pathname).void }
diff --git a/Library/Homebrew/cmd/rbenv-sync.rb b/Library/Homebrew/cmd/rbenv-sync.rb
index 158728e941..d8ba62f5e9 100755
--- a/Library/Homebrew/cmd/rbenv-sync.rb
+++ b/Library/Homebrew/cmd/rbenv-sync.rb
@@ -29,22 +29,24 @@ module Homebrew
     rbenv_sync_running = dot_rbenv/".rbenv_sync_running"
     return if rbenv_sync_running.exist?
 
-    rbenv_versions = dot_rbenv/"versions"
-    rbenv_versions.mkpath
-    FileUtils.touch rbenv_sync_running
+    begin
+      rbenv_versions = dot_rbenv/"versions"
+      rbenv_versions.mkpath
+      FileUtils.touch rbenv_sync_running
 
-    rbenv_sync_args.parse
+      rbenv_sync_args.parse
 
-    HOMEBREW_CELLAR.glob("ruby{,@*}")
-                   .flat_map(&:children)
-                   .each { |path| link_rbenv_versions(path, rbenv_versions) }
+      HOMEBREW_CELLAR.glob("ruby{,@*}")
+                     .flat_map(&:children)
+                     .each { |path| link_rbenv_versions(path, rbenv_versions) }
 
-    rbenv_versions.children
-                  .select(&:symlink?)
-                  .reject(&:exist?)
-                  .each { |path| FileUtils.rm_f path }
-  ensure
-    rbenv_sync_running.unlink if rbenv_sync_running.exist?
+      rbenv_versions.children
+                    .select(&:symlink?)
+                    .reject(&:exist?)
+                    .each { |path| FileUtils.rm_f path }
+    ensure
+      rbenv_sync_running.unlink if rbenv_sync_running.exist?
+    end
   end
 
   sig { params(path: Pathname, rbenv_versions: Pathname).void }