From 189a66340d7301191b00a74f9d5750f238f42304 Mon Sep 17 00:00:00 2001
From: Rhys Murray <contact@rhysmurray.me>
Date: Sat, 8 Apr 2023 20:42:01 +1000
Subject: [PATCH 1/4] command prefix to command

---
 dev/app.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev/app.go b/dev/app.go
index 955ddc6..e0810d3 100644
--- a/dev/app.go
+++ b/dev/app.go
@@ -261,10 +261,10 @@ if test -e .pumaenv && [ "$PUMADEV_SOURCE_PUMAENV" != "0" ]; then
 fi
 
 if test -e Gemfile && bundle exec puma -V &>/dev/null; then
-	exec bundle exec puma -C $CONFIG --tag puma-dev:%s -w $WORKERS -t 0:$THREADS -b unix:%s
+	exec $COMMAND_PREFIX bundle exec puma -C $CONFIG --tag puma-dev:%s -w $WORKERS -t 0:$THREADS -b unix:%s <&2
 fi
 
-exec puma -C $CONFIG --tag puma-dev:%s -w $WORKERS -t 0:$THREADS -b unix:%s'
+exec $COMMAND_PREFIX puma -C $CONFIG --tag puma-dev:%s -w $WORKERS -t 0:$THREADS -b unix:%s'
 `
 
 func (pool *AppPool) LaunchApp(name, dir string) (*App, error) {
@@ -283,6 +283,7 @@ func (pool *AppPool) LaunchApp(name, dir string) (*App, error) {
 		shell = "/bin/bash"
 	}
 
+ fmt.Print(executionShell)
 	cmd := exec.Command(shell, "-l", "-i", "-c",
 		fmt.Sprintf(executionShell, dir, name, socket, name, socket))
 

From 229f75a4e3f3bb97bd7b5c7b76ae53a1a9fc12f3 Mon Sep 17 00:00:00 2001
From: Rhys Murray <contact@rhysmurray.me>
Date: Sat, 8 Apr 2023 20:47:30 +1000
Subject: [PATCH 2/4] remove bad line

---
 dev/app.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/app.go b/dev/app.go
index e0810d3..d0b22e2 100644
--- a/dev/app.go
+++ b/dev/app.go
@@ -261,7 +261,7 @@ if test -e .pumaenv && [ "$PUMADEV_SOURCE_PUMAENV" != "0" ]; then
 fi
 
 if test -e Gemfile && bundle exec puma -V &>/dev/null; then
-	exec $COMMAND_PREFIX bundle exec puma -C $CONFIG --tag puma-dev:%s -w $WORKERS -t 0:$THREADS -b unix:%s <&2
+	exec $COMMAND_PREFIX bundle exec puma -C $CONFIG --tag puma-dev:%s -w $WORKERS -t 0:$THREADS -b unix:%s
 fi
 
 exec $COMMAND_PREFIX puma -C $CONFIG --tag puma-dev:%s -w $WORKERS -t 0:$THREADS -b unix:%s'

From f7971e623350de69898444b958730160aeebf884 Mon Sep 17 00:00:00 2001
From: Rhys Murray <contact@rhysmurray.me>
Date: Sat, 8 Apr 2023 20:55:38 +1000
Subject: [PATCH 3/4] remove print line

---
 dev/app.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/app.go b/dev/app.go
index d0b22e2..d7522a8 100644
--- a/dev/app.go
+++ b/dev/app.go
@@ -283,7 +283,6 @@ func (pool *AppPool) LaunchApp(name, dir string) (*App, error) {
 		shell = "/bin/bash"
 	}
 
- fmt.Print(executionShell)
 	cmd := exec.Command(shell, "-l", "-i", "-c",
 		fmt.Sprintf(executionShell, dir, name, socket, name, socket))
 

From faca79e392c110c3983025103ceb7ee81f1931eb Mon Sep 17 00:00:00 2001
From: Rhys Murray <contact@rhysmurray.me>
Date: Sat, 8 Apr 2023 21:06:37 +1000
Subject: [PATCH 4/4] fix bundle placement

---
 dev/app.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/app.go b/dev/app.go
index d7522a8..49454e6 100644
--- a/dev/app.go
+++ b/dev/app.go
@@ -261,7 +261,7 @@ if test -e .pumaenv && [ "$PUMADEV_SOURCE_PUMAENV" != "0" ]; then
 fi
 
 if test -e Gemfile && bundle exec puma -V &>/dev/null; then
-	exec $COMMAND_PREFIX bundle exec puma -C $CONFIG --tag puma-dev:%s -w $WORKERS -t 0:$THREADS -b unix:%s
+	exec bundle exec $COMMAND_PREFIX puma -C $CONFIG --tag puma-dev:%s -w $WORKERS -t 0:$THREADS -b unix:%s
 fi
 
 exec $COMMAND_PREFIX puma -C $CONFIG --tag puma-dev:%s -w $WORKERS -t 0:$THREADS -b unix:%s'