Module: check_mk
Branch: master
Commit: 5148f3585dc10335c905c28a5bb42de8803ffed9
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5148f3585dc103…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Dec 11 15:07:46 2014 +0100
Fixed version number update for agents
Conflicts:
agents/windows/install_agent-64.exe
agents/windows/install_agent.exe
---
agents/Makefile | 6 +++---
agents/windows/install_agent-64.exe | Bin 160686 -> 160686 bytes
agents/windows/install_agent.exe | Bin 157644 -> 157644 bytes
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/agents/Makefile b/agents/Makefile
index 8741b8b..39a863c 100644
--- a/agents/Makefile
+++ b/agents/Makefile
@@ -52,13 +52,13 @@ waitmax: waitmax.c
setversion:
sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ;
\
- sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/'
agents/check_mk_agent.openvms ; \
- for agent in *; do \
+ sed -i 's/say "Version: .*"/say "Version: $(NEW_VERSION)"/'
check_mk_agent.openvms ; \
+ for agent in check_mk_agent.*; do \
if [ "$$agent" != windows -a "$$agent" != plugins -a
"$$agent" != hpux ] ; then \
sed -i 's/echo Version: [0-9.a-z]*/'"echo Version:
$(NEW_VERSION)/g" $$agent; \
fi ; \
done ; \
- $(MAKE) -C agents NEW_VERSION=$(NEW_VERSION) setversion
+ $(MAKE) -C windows NEW_VERSION=$(NEW_VERSION) setversion
packages: rpm deb
diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe
index 2b6ab0e..cd87e90 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 8a4115a..a460125 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ