From 99855ae9f831b9f2d45e85050f08ae20ba00e27a Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Thu, 14 Mar 2024 06:09:15 -0400
Subject: [PATCH] fix: correct issue with cancel

---
 plugins/builds/plugin.toml        |  2 +-
 plugins/builds/subcommands/cancel | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/builds/plugin.toml b/plugins/builds/plugin.toml
index 3dae3d778..7dadc67c8 100644
--- a/plugins/builds/plugin.toml
+++ b/plugins/builds/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku core builds plugin"
-version = "0.33.6"
+version = "0.33.9"
 [plugin.config]
diff --git a/plugins/builds/subcommands/cancel b/plugins/builds/subcommands/cancel
index a45d85f99..818905a4c 100755
--- a/plugins/builds/subcommands/cancel
+++ b/plugins/builds/subcommands/cancel
@@ -8,12 +8,13 @@ cmd-builds-cancel() {
   declare cmd="builds:cancel"
   [[ "$1" == "$cmd" ]] && shift 1
   declare APP="$1"
+  local APP_DEPLOY_LOCK_FILE PROCESS_ID PROCESS_GROUP_ID
   verify_app_name "$APP"
 
   local APP_DEPLOY_LOCK_FILE PROCESS_ID PROCESS_GROUP_ID
-  APP_DEPLOY_LOCK_FILE="$DOKKU_ROOT/$APP/.deploy.lock"
+  APP_DEPLOY_LOCK_FILE="$DOKKU_LIB_ROOT/data/apps/$APP/.deploy.lock"
   if [[ ! -f "$APP_DEPLOY_LOCK_FILE" ]]; then
-    dokku_log_info1 "No matching app deploy found"
+    dokku_log_info1 "App not currently deploying"
     return
   fi
 
@@ -25,12 +26,12 @@ cmd-builds-cancel() {
 
   PROCESS_GROUP_ID="$(ps -o pgid= "$PROCESS_ID" || true)"
   if [[ -z "$PROCESS_ID" ]]; then
-    dokku_log_info1 "No matching app deploy found"
+    dokku_log_info1 "Unable to find process group id for app deploy"
     return
   fi
 
   dokku_log_info1 "Killing app deploy"
-  kill -quit -- "-${PROCESS_GROUP_ID}" && rm -f "$DOKKU_ROOT/$APP/.deploy.lock"
+  kill -quit -- "-${PROCESS_GROUP_ID}" && rm -f "$APP_DEPLOY_LOCK_FILE"
 }
 
-ps_kill_deploy_cmd "$@"
+cmd-builds-cancel "$@"
\ No newline at end of file