From 49d61f0da06e2f634fd91f8fcf1423803c6036e4 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 1 Jun 2025 15:57:52 +1200 Subject: [PATCH] 'Generic Commit' --- source/src/services.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/source/src/services.cpp b/source/src/services.cpp index 9aa5cd8..0e79267 100644 --- a/source/src/services.cpp +++ b/source/src/services.cpp @@ -230,6 +230,13 @@ namespace dropshell warning << "Expected environment file not found: " << file << std::endl; }; + + // add in some simple variables first, as others below may depend on/use these in bash. + // if we change these, we also need to update agent/_allservicesstatus.sh + all_env_vars["SERVER"] = server_name; + all_env_vars["SERVICE"] = service_name; + all_env_vars["DOCKER_CLI_HINTS"] = "false"; // turn off docker junk. + // Load environment files load_env_file(localfile::service_env(server_name, service_name)); load_env_file(localfile::template_info_env(server_name, service_name)); @@ -243,13 +250,10 @@ namespace dropshell return false; } - // add in some handy variables. - // if we change these, we also need to update agent/_allservicesstatus.sh + // more additional, these depend on others above. all_env_vars["CONFIG_PATH"] = remotepath(server_name, user).service_config(service_name); - all_env_vars["SERVER"] = server_name; - all_env_vars["SERVICE"] = service_name; all_env_vars["AGENT_PATH"] = remotepath(server_name, user).agent(); - all_env_vars["DOCKER_CLI_HINTS"] = "false"; // turn off docker junk. + // determine template name. auto it = all_env_vars.find("TEMPLATE");