# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1584798891 -3600
# Node ID 39e11db3ea78a9f84f85771f67c518dcf0a9a7d6
# Parent  f3fb994aac6ded8e72644a535a8a22886d920fc7
updated nagios-plugins and  nagios-plugins-mysql (2.2.1 -> 2.3.3)

diff -r f3fb994aac6d -r 39e11db3ea78 nagios-plugins-mysql/receipt
--- a/nagios-plugins-mysql/receipt	Sat Mar 21 14:45:16 2020 +0100
+++ b/nagios-plugins-mysql/receipt	Sat Mar 21 14:54:51 2020 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="nagios-plugins-mysql"
-VERSION="2.2.1"
+VERSION="2.3.3"
 CATEGORY="meta"
 SHORT_DESC="Dependencies for Nagios MySQL plugin."
 MAINTAINER="erjo@slitaz.org"
diff -r f3fb994aac6d -r 39e11db3ea78 nagios-plugins/receipt
--- a/nagios-plugins/receipt	Sat Mar 21 14:45:16 2020 +0100
+++ b/nagios-plugins/receipt	Sat Mar 21 14:54:51 2020 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="nagios-plugins"
-VERSION="2.2.1"
+VERSION="2.3.3"
 CATEGORY="network"
 SHORT_DESC="Plugins for host, service and network monitoring program nagios."
 MAINTAINER="erjo@slitaz.org"
@@ -26,7 +26,7 @@
 		--with-ping-command="/bin/ping -w %d -c %d %s"	\
 		--with-fping-command="/usr/sbin/fping"		\
 		--mandir=/usr/share/man				\
-		$CONFIGURE_ARGS
+		$CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR install &&
 	make DESTDIR=$DESTDIR install-root
@@ -38,18 +38,19 @@
 	mkdir -p $fs/usr/lib
 	mkdir -p $fs/etc/nagios/objects
 
-	cp -a $install/usr/lib/nagios/ $fs/usr/lib
+	cp -a $install/usr/lib/nagios	$fs/usr/lib
 
 	# 
 	stuff/convertcfg $src/command.cfg commands > $fs/etc/nagios/objects/command.cfg
 	
 	# Move mySQL plugins in a separate package.
-	rm -f $fs/usr/lib/nagios/plugins/*mysql*
+	rm -f				$fs/usr/lib/nagios/plugins/*mysql*
 }
 
 post_install()
 {
-	if ! grep -q nagios "$1/etc/passwd"; then
+	if ! grep -q nagios "$1/etc/passwd"
+	  then
 		echo
 		echo -n "Adding user/group nagios..."
 		chroot "$1/" addgroup -S nagios
@@ -57,12 +58,13 @@
 		status
 	fi
 	
-	if [ -f "$1/etc/nagios/resource.cfg" ]; then
+	if [ -f "$1/etc/nagios/resource.cfg" ]
+	  then
 		sed -i 's|/usr/lib/nagios|/usr/lib/nagios/plugins|' \
 		   "$1/etc/nagios/resource.cfg"
 	fi
 
 	# Set permissions for files and directories
-	chroot "$1/" chown -R nagios.nagios /usr/lib/nagios/plugins 
-	chroot "$1/" chown -R nagios.nagios /etc/nagios/objects
+	chroot "$1/" chown -R nagios.nagios	/usr/lib/nagios/plugins 
+	chroot "$1/" chown -R nagios.nagios	/etc/nagios/objects
 }