From 42e25b635337f703daef2e6d5fadc0f978e59863 Mon Sep 17 00:00:00 2001
From: Your Name <j@842.be>
Date: Mon, 5 May 2025 23:18:00 +1200
Subject: [PATCH] Fixin'

---
 src/service_runner.cpp                            | 12 +++++++++---
 templates/dropshell-agent/shared/_autocommands.sh |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/service_runner.cpp b/src/service_runner.cpp
index 1acabc2..4a8d0f7 100644
--- a/src/service_runner.cpp
+++ b/src/service_runner.cpp
@@ -234,6 +234,12 @@ bool service_runner::run_command(const std::string& command, std::vector<std::st
     if (command == "fullnuke") 
         return fullnuke();
 
+    if (command == "nuke") 
+    {
+        std::cout << "Nuking " << mService << " (" << mServiceInfo.template_name << ") on " << mServer << std::endl;
+        return nuke();
+    }
+
     if (!gTemplateManager().template_command_exists(mServiceInfo.template_name, command)) {
         std::cout << "No command script for " << mServiceInfo.template_name << " : " << command << std::endl;
         return true; // nothing to run.
@@ -247,25 +253,25 @@ bool service_runner::run_command(const std::string& command, std::vector<std::st
     
     // Check if service directory exists
     if (!mServerEnv.check_remote_dir_exists(remotepath::service(mServer, mService))) {
+        std::cerr << "Error: Service is not installed: " << mService << std::endl;
         return false;
     }
     
     // Check if command script exists
     if (!mServerEnv.check_remote_file_exists(script_path)) {
+        std::cerr << "Error: Remote command script not found: " << script_path << std::endl;
         return false;
     }
 
     // Check if env file exists
     if (!mServerEnv.check_remote_file_exists(remotefile::service_env(mServer, mService))) {
+        std::cerr << "Error: Service config file not found: " << remotefile::service_env(mServer, mService) << std::endl;
         return false;
     }
 
     if (command == "uninstall") 
         return uninstall();
 
-    if (command == "nuke") 
-        return nuke();
-
     if (command == "ssh") {
         interactive_ssh_service();
         return true;
diff --git a/templates/dropshell-agent/shared/_autocommands.sh b/templates/dropshell-agent/shared/_autocommands.sh
index 85dccdf..c338757 100644
--- a/templates/dropshell-agent/shared/_autocommands.sh
+++ b/templates/dropshell-agent/shared/_autocommands.sh
@@ -45,7 +45,7 @@ _autocommandrun_path() {
             PATHPARENT=$(dirname ${path})
             PATHCHILD=$(basename ${path})
             if [ -d "${PATHPARENT}/${PATHCHILD}" ]; then
-                docker run --rm -v ${PATHPARENT}:/volume debian bash -c "rm -rf /volume/${PATHCHILD}"
+                docker run --rm -v ${PATHPARENT}:/volume debian bash -c "rm -rf /volume/${PATHCHILD}" || echo "Failed to nuke path ${path}"
             else
                 echo "Path ${path} does not exist - nothing to nuke"
             fi