Module: check_mk Branch: master Commit: 177a7a0dcc8731a63dd58dc02f639d31c912006e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=177a7a0dcc8731… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Nov 30 20:44:14 2018 +0100 Unbreak OMD hook installation. Change-Id: I0d0f71e3f0ecc31157871c8f77d156b057f5569b --- omd/packages/omd/.f12 | 9 +++++---- omd/packages/omd/{ => hooks}/ADMIN_MAIL | 0 omd/packages/omd/{ => hooks}/APACHE_MODE | 0 omd/packages/omd/{ => hooks}/AUTOSTART | 0 omd/packages/omd/{ => hooks}/CORE | 0 omd/packages/omd/{ => hooks}/TMPFS | 0 omd/packages/omd/omd.make | 6 +----- 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/omd/packages/omd/.f12 b/omd/packages/omd/.f12 index 771d63f..e24c1a5 100755 --- a/omd/packages/omd/.f12 +++ b/omd/packages/omd/.f12 @@ -11,10 +11,11 @@ sudo cp -v logout.php $ROOT/share/omd/htdocs/logout.php sudo rm -vf $ROOT/share/man/man8/omd.8.gz sudo cp -v omd.8 $ROOT/share/man/man8/omd.8 sudo gzip $ROOT/share/man/man8/omd.8 -for hook in *.hook; do - sudo cp -v $hook $ROOT/lib/omd/hooks/${hook%*.hook} - sudo chmod +x $ROOT/lib/omd/hooks/${hook%*.hook} -done +( cd hooks; \ + for hook in *; do \ + sudo cp -v $hook $ROOT/lib/omd/hooks/$hook ; \ + sudo chmod +x $ROOT/lib/omd/hooks/$hook ; \ + done ) sudo mkdir -p $ROOT/lib/omd/scripts/post-create sudo cp -v omd.service $ROOT/share/omd sudo cp -v omd.bin $ROOT/bin/omd diff --git a/omd/packages/omd/ADMIN_MAIL b/omd/packages/omd/hooks/ADMIN_MAIL similarity index 100% rename from omd/packages/omd/ADMIN_MAIL rename to omd/packages/omd/hooks/ADMIN_MAIL diff --git a/omd/packages/omd/APACHE_MODE b/omd/packages/omd/hooks/APACHE_MODE similarity index 100% rename from omd/packages/omd/APACHE_MODE rename to omd/packages/omd/hooks/APACHE_MODE diff --git a/omd/packages/omd/AUTOSTART b/omd/packages/omd/hooks/AUTOSTART similarity index 100% rename from omd/packages/omd/AUTOSTART rename to omd/packages/omd/hooks/AUTOSTART diff --git a/omd/packages/omd/CORE b/omd/packages/omd/hooks/CORE similarity index 100% rename from omd/packages/omd/CORE rename to omd/packages/omd/hooks/CORE diff --git a/omd/packages/omd/TMPFS b/omd/packages/omd/hooks/TMPFS similarity index 100% rename from omd/packages/omd/TMPFS rename to omd/packages/omd/hooks/TMPFS diff --git a/omd/packages/omd/omd.make b/omd/packages/omd/omd.make index 2be3abb..a0de0d2 100644 --- a/omd/packages/omd/omd.make +++ b/omd/packages/omd/omd.make @@ -36,11 +36,7 @@ $(OMD_INSTALL): install -m 755 $(PACKAGE_DIR)/$(OMD)/port_is_used $(DESTDIR)$(OMD_ROOT)/lib/omd/ install -m 644 $(PACKAGE_DIR)/$(OMD)/bash_completion $(DESTDIR)$(OMD_ROOT)/lib/omd/ $(MKDIR) $(DESTDIR)$(OMD_ROOT)/lib/omd/scripts/post-create - install -m 755 $(PACKAGE_DIR)/$(OMD)/ADMIN_MAIL $(DESTDIR)$(OMD_ROOT)/lib/omd/hooks/ - install -m 755 $(PACKAGE_DIR)/$(OMD)/APACHE_MODE $(DESTDIR)$(OMD_ROOT)/lib/omd/hooks/ - install -m 755 $(PACKAGE_DIR)/$(OMD)/AUTOSTART $(DESTDIR)$(OMD_ROOT)/lib/omd/hooks/ - install -m 755 $(PACKAGE_DIR)/$(OMD)/CORE $(DESTDIR)$(OMD_ROOT)/lib/omd/hooks/ - install -m 755 $(PACKAGE_DIR)/$(OMD)/TMPFS $(DESTDIR)$(OMD_ROOT)/lib/omd/hooks/ + install -m 755 $(PACKAGE_DIR)/$(OMD)/hooks/* $(DESTDIR)$(OMD_ROOT)/lib/omd/hooks/ $(TOUCH) $@