Merge pull request #109 from victormlg/CFE-4446-check-binaries-in-path

Added check if binaries are in path
cfengine · Jan 8, 2025 · a22a1d7 · a22a1d7
2 parents f86e5a4 + cf2e698
commit a22a1d7
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/cf_remote/remote.py b/cf_remote/remote.py
@@ -600,13 +600,23 @@ def deploy_masterfiles(host, tarball, *, connection=None):
         scp(tarball, host, connection=connection, rename="masterfiles.tgz")
         tarball = "masterfiles.tgz"
     ssh_cmd(connection, "tar -xzf %s" % tarball)
+
+    cfagent_path = ""
+    if not ssh_sudo(connection, "command -v cf-agent"):
+        log.debug("cf-agent is not in $PATH")
+
+        if ssh_cmd(connection, "command -v /var/cfengine/bin/cf-agent"):
+            cfagent_path = "/var/cfengine/bin/"
+        else:
+            user_error("Cannot find the path to cf-agent.")
+
     commands = [
         "rm -rf /var/cfengine/masterfiles.delete",
         "mv /var/cfengine/masterfiles /var/cfengine/masterfiles.delete",
         "mv masterfiles /var/cfengine/masterfiles",
         "rm -rf /var/cfengine/masterfiles.delete",
-        "cf-agent -Kf update.cf",
-        "cf-agent -K",
+        "{}cf-agent -Kf update.cf".format(cfagent_path),
+        "{}cf-agent -K".format(cfagent_path),
     ]
     combined = " && ".join(commands)
     print("Running: '%s'" % combined)