From f3d714839515d952b4437c6d6d636f8ca93e8577 Mon Sep 17 00:00:00 2001
From: Ryan Ahearn <ryan.ahearn@gsa.gov>
Date: Mon, 16 Jun 2025 16:11:33 -0400
Subject: [PATCH] Prevent conflicts between bundle/bin and $HOME/bin

---
 runner-manager/cf-driver/worker-setup/bundle/glrw-setup.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/runner-manager/cf-driver/worker-setup/bundle/glrw-setup.sh b/runner-manager/cf-driver/worker-setup/bundle/glrw-setup.sh
index 2227a96..7eb577e 100755
--- a/runner-manager/cf-driver/worker-setup/bundle/glrw-setup.sh
+++ b/runner-manager/cf-driver/worker-setup/bundle/glrw-setup.sh
@@ -15,6 +15,10 @@ if [ "$dir" != "$HOME/bundle" ]; then
 fi
 
 # started in ./bundle, unpack to home
+if [ -d "$HOME/bin" ]; then
+    mv ./bin/* "$HOME/bin"
+    rmdir ./bin
+fi
 mv ./* "$HOME"
 cd "$HOME" || exit 1