Fixes + Tests

Signed-off-by: Timofey Titovets <nefelim4ag@gmail.com>

1 files changed, 20 insertions, 10 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 96d895b0b0c7..6f4b488af5f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ url="https://github.com/Zygo/bees"
 license=('GPL3')
 depends=()
 makedepends=('git' 'make' 'gcc' 'markdown')
-source=("$pkgname"::'git://github.com/Zygo/bees.git#branch=master')
+source=("$pkgname"::'git://github.com/zygo/bees.git#branch=master')
 md5sums=('SKIP')
 
 pkgver() {
@@ -18,19 +18,29 @@ pkgver() {
 }
 
 build() {
-	cd ${pkgname}
+	cd "$pkgname"
 	make
+	make scripts
 }
 
 package() {
-	cd "${pkgname}"
+	cd "$pkgname"
+
 	make install PREFIX="${pkgdir}"
 	make install_scripts PREFIX="${pkgdir}"
-	mkdir -p ${pkgdir}/usr/bin/
-	[ -f ${pkgdir}/usr/sbin/beesd ] && \
-		mv -v ${pkgdir}/usr/sbin/beesd ${pkgdir}/usr/bin/beesd
-	mkdir -p ${pkgdir}/usr/lib/systemd/system/
-	mv -v ${pkgdir}/lib/systemd/system/beesd@.service ${pkgdir}/usr/lib/systemd/system/
-	sed -i -e 's#/usr/sbin/beesd#/usr/bin/beesd#g' ${pkgdir}/usr/lib/systemd/system/beesd@.service
-	rm -rf ${pkgdir}/lib
+
+	mkdir -p "${pkgdir}/usr/bin/"
+
+	if [ -f "${pkgdir}/usr/sbin/beesd" ]; then
+		mv -v "${pkgdir}/usr/sbin/beesd" "${pkgdir}/usr/bin/beesd"
+		sed -i -e 's#/usr/sbin/beesd#/usr/bin/beesd#g' "${pkgdir}/lib/systemd/system/beesd@.service"
+	fi
+
+	if grep 'makepkg' "${pkgdir}/usr/bin/beesd"; then
+		exit 1
+	fi
+
+	mkdir -p "${pkgdir}/usr/lib/systemd/system/"
+	mv -v "${pkgdir}/lib/systemd/system/beesd@.service" "${pkgdir}/usr/lib/systemd/system/"
+	find ${pkgdir} -empty -delete -print
 }