From 04cb25bd04da1088f643a3183e76db6cd7b02735 Mon Sep 17 00:00:00 2001
From: Kai Krakow <kai@kaishome.de>
Date: Tue, 19 Sep 2017 20:30:51 +0200
Subject: [PATCH] Move bees to libexec install dir

When bees is meant to be run mainly through the service frontend script,
we should move the bees binary to the libexec directory.
---
 Makefile      | 2 +-
 scripts/beesd | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 35378fb..8160da2 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ README.html: README.md
 install: ## Install bees + libs
 install: lib src test
 	install -Dm644 lib/libcrucible.so $(PREFIX)/usr/lib/libcrucible.so
-	install -Dm755 bin/bees $(PREFIX)/usr/bin/bees
+	install -Dm755 bin/bees $(PREFIX)/usr/libexec/bees
 
 install_scripts: ## Install scipts
 	install -Dm755 scripts/beesd $(PREFIX)/usr/bin/beesd
diff --git a/scripts/beesd b/scripts/beesd
index cfe256c..cd52c9a 100755
--- a/scripts/beesd
+++ b/scripts/beesd
@@ -21,7 +21,7 @@ readonly CONFIG_DIR=/etc/bees/
     [ "$UID" == "0" ] || ERRO "Must be runned as root"
 }
 
-command -v bees &> /dev/null || ERRO "Missing 'bees' command"
+command -v /usr/libexec/bees &> /dev/null || ERRO "Missing 'bees' agent"
 
 ## Parse args
 UUID="$1"
@@ -123,6 +123,6 @@ filter_path(){
     fi
 }
 
-bees "$MNT_DIR" 3>&1 2>&1 | filter_time | filter_path
+/usr/libexec/bees "$MNT_DIR" 3>&1 2>&1 | filter_time | filter_path
 
 exit 0