Module: check_mk
Branch: master
Commit: 15c6738dd533049743dbc944c974364ed099cf6f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15c6738dd53304…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Aug 5 15:39:00 2015 +0200
check_mk_agent: code cleanup for upcoming agent feature
---
agents/windows/build_version | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 302080 -> 302080 bytes
agents/windows/check_mk_agent-64.unversioned.exe | Bin 302080 -> 302080 bytes
agents/windows/check_mk_agent.cc | 14 +++++++++++---
agents/windows/check_mk_agent.exe | Bin 183808 -> 183808 bytes
agents/windows/check_mk_agent.msi | Bin 734720 -> 734720 bytes
agents/windows/check_mk_agent.unversioned.exe | Bin 183808 -> 183808 bytes
agents/windows/install_agent-64.exe | Bin 179044 -> 179051 bytes
agents/windows/install_agent.exe | Bin 160003 -> 160025 bytes
9 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/agents/windows/build_version b/agents/windows/build_version
index ca55a6c..08839f6 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-198
+200
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index 666b0f4..b1cb3c3 100755
Binary files a/agents/windows/check_mk_agent-64.exe and
b/agents/windows/check_mk_agent-64.exe differ
diff --git a/agents/windows/check_mk_agent-64.unversioned.exe
b/agents/windows/check_mk_agent-64.unversioned.exe
index 3ca66e0..3edfd78 100755
Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and
b/agents/windows/check_mk_agent-64.unversioned.exe differ
diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc
index 1c2cd52..ab6bc48 100644
--- a/agents/windows/check_mk_agent.cc
+++ b/agents/windows/check_mk_agent.cc
@@ -5114,19 +5114,27 @@ void do_unpack_plugins(char *plugin_filename) {
}
}
}
+ if (dirname == NULL)
+ filename = filepath;
if (dirname != NULL) {
char new_dir[1024];
snprintf(new_dir, sizeof(new_dir), "%s\\%s", g_agent_directory,
dirname);
CreateDirectory(new_dir, NULL);
+ fprintf(uninstall_file, "del \"%s\\%s\\%s\"\n",
g_agent_directory, dirname, filename);
}
+ else
+ fprintf(uninstall_file, "del \"%s\\%s\"\n",
g_agent_directory, filename);
- // Add uninstall information for this plugin
- fprintf(uninstall_file, "del \"%s\\%s\\%s\"\n",
g_agent_directory, dirname, filename);
+ // TODO: remove custom dirs on uninstall
// Write plugin
char plugin_path[512];
- snprintf(plugin_path, sizeof(plugin_path), "%s\\%s\\%s",
g_agent_directory, dirname, filename);
+ if (dirname != NULL)
+ snprintf(plugin_path, sizeof(plugin_path), "%s\\%s\\%s",
g_agent_directory, dirname, filename);
+ else
+ snprintf(plugin_path, sizeof(plugin_path), "%s\\%s",
g_agent_directory, filename);
+
FILE *plugin_file = fopen(plugin_path, "wb");
fwrite(content, 1, content_length, plugin_file);
fclose(plugin_file);
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index eedb2d9..3d39d84 100755
Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe
differ
diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi
index 3db52a5..e212db8 100755
Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi
differ
diff --git a/agents/windows/check_mk_agent.unversioned.exe
b/agents/windows/check_mk_agent.unversioned.exe
index 0573dc3..9ad9f0c 100755
Binary files a/agents/windows/check_mk_agent.unversioned.exe and
b/agents/windows/check_mk_agent.unversioned.exe differ
diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe
index 7ef306c..0e27d75 100755
Binary files a/agents/windows/install_agent-64.exe and
b/agents/windows/install_agent-64.exe differ
diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe
index 1c31b2d..dd1d83e 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ