# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1449242324 -7200
# Node ID fca172c323cf7d25ab147cbf7332b6be52bcbca8
# Parent  d5f9f516b7065abff070c5b406b2499e16d9cfe2
Change messaging... (again); libgtop-dev, libsecret-dev: implicit dependencies don't works?

diff -r d5f9f516b706 -r fca172c323cf backuppc/receipt
--- a/backuppc/receipt	Fri Dec 04 16:32:53 2015 +0200
+++ b/backuppc/receipt	Fri Dec 04 17:18:44 2015 +0200
@@ -73,6 +73,7 @@
 		/etc/init.d/apache start
 	fi
 	cat <<EOT
+
 Now you should :
 - append $1/etc/BackupPC/.ssh/id_rsa.pub to every unix client /root/.ssh/authorized_keys file
 - update \$Conf{CgiAdminUsers} in $1/etc/BackupPC/config.pl 
diff -r d5f9f516b706 -r fca172c323cf barnyard2/receipt
--- a/barnyard2/receipt	Fri Dec 04 16:32:53 2015 +0200
+++ b/barnyard2/receipt	Fri Dec 04 17:18:44 2015 +0200
@@ -16,38 +16,38 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	./configure --sysconfdir=/etc/barnyard2 $CONFIGURE_ARGS && make && make install
+	./configure \
+		--sysconfdir=/etc/barnyard2 \
+		$CONFIGURE_ARGS &&
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	
 	cp -a $install/* $fs
-	
-	mkdir -p /var/log/barnyard2
+	mkdir -p $fs/var/log/barnyard2
 }
 
 # Post install commands
 post_install()
 {
-        echo "Processing post install commands..."
+	[ -z "$quiet" ] && echo
 
-        # addgroup snort if needed
-    if ! grep -q 'snort:' $1/etc/group; then
-        echo -n "Adding group Snort..."
-        chroot $1/ /bin/addgroup snort
-        status
-    fi
-    # adduser snort if needed
-    if ! grep -q 'snort:' $1/etc/passwd; then
-        echo -n "Adding user Snort..."
-        chroot $1/ /bin/adduser -s /bin/false -h /dev/null \
-            -g "Snort Daemon user" -H -D -S -G snort snort
-        status
-    fi
+	# addgroup snort if needed
+	if ! grep -q 'snort:' "$1/etc/group"; then
+		action 'Adding group Snort...'
+		chroot "$1/" /bin/addgroup snort
+		status
+	fi
 
-        chroot $1/ chown snort.snort /var/log/barnyard2
+	# adduser snort if needed
+	if ! grep -q 'snort:' $1/etc/passwd; then
+		action 'Adding user Snort...'
+		chroot "$1/" /bin/adduser -s /bin/false -h /dev/null \
+			-g "Snort Daemon user" -H -D -S -G snort snort
+		status
+	fi
+
+	chroot "$1/" chown snort.snort /var/log/barnyard2
 }
-
diff -r d5f9f516b706 -r fca172c323cf beep/receipt
--- a/beep/receipt	Fri Dec 04 16:32:53 2015 +0200
+++ b/beep/receipt	Fri Dec 04 17:18:44 2015 +0200
@@ -13,7 +13,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	make
 }
 
@@ -24,13 +23,7 @@
 	cp $src/beep $fs/usr/bin
 }
 
-# Overlap busybox
-pre_install()
-{
-	rm -f $1/usr/bin/beep
-}
-
 post_remove()
 {
-	ln -s /bin/busybox /usr/bin/beep
+	ln -s /bin/busybox "$1/usr/bin/beep"
 }
diff -r d5f9f516b706 -r fca172c323cf bind-client/receipt
--- a/bind-client/receipt	Fri Dec 04 16:32:53 2015 +0200
+++ b/bind-client/receipt	Fri Dec 04 17:18:44 2015 +0200
@@ -18,14 +18,7 @@
 	cp -a $install/usr/bin $fs/usr
 }
 
-# Overlap busybox
-pre_install()
-{
-	rm -f $1/usr/bin/nslookup
-}
-
 post_remove()
 {
-	ln -s /bin/busybox $1/usr/bin/nslookup
+	ln -s /bin/busybox "$1/usr/bin/nslookup"
 }
-
diff -r d5f9f516b706 -r fca172c323cf blinder-theme/receipt
--- a/blinder-theme/receipt	Fri Dec 04 16:32:53 2015 +0200
+++ b/blinder-theme/receipt	Fri Dec 04 17:18:44 2015 +0200
@@ -13,11 +13,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir -p $fs/usr/share/themes
-    cp -a stuff/* $fs/usr/share/themes
+	mkdir -p $fs/usr/share/themes
+	cp -a stuff/* $fs/usr/share/themes
 }
-
-post_install()
-{
-    tazbox notify "Blinder Theme \n\n Successfully installed!"
-}
\ No newline at end of file
diff -r d5f9f516b706 -r fca172c323cf bootchart/receipt
--- a/bootchart/receipt	Fri Dec 04 16:32:53 2015 +0200
+++ b/bootchart/receipt	Fri Dec 04 17:18:44 2015 +0200
@@ -37,6 +37,7 @@
 			root_dev=`sed -n 's/.*root=\([^ ]*\).*/\1/p' "$MENU" | head -n1`
 			grub_dev=`sed -n '/^[^#]*root.* (/p' "$MENU" | head -n1`
 			# Add new kernel entry for bootchart and display information message
+			echo
 			echo "----"
 			echo "GRUB is installed, these tree lines has been added to the menu.lst:"
 			tee -a "$MENU" << EOT
@@ -47,6 +48,7 @@
 EOT
 			echo "----"
 		else
+			echo
 			echo "Grub menu.lst seems already configured to boot new Kernel..."
 		fi
 	fi
diff -r d5f9f516b706 -r fca172c323cf boxbackup-client/receipt
--- a/boxbackup-client/receipt	Fri Dec 04 16:32:53 2015 +0200
+++ b/boxbackup-client/receipt	Fri Dec 04 17:18:44 2015 +0200
@@ -13,7 +13,7 @@
 
 DEPENDS="db libedit libssl perl zlib gcc-lib-base"
 
-# Configuration variables                                                                                                    
+# Configuration variables
 CONF_DIR="/etc/boxbackup"
 DATA_DIR="/var/lib/bbackupd"
 RUN_DMON=0
@@ -33,7 +33,7 @@
 pre_install()
 {
 	# Stop daemon
-	if [ -e /var/run/bbackupd.pid ]; then
+	if [ -z "$1" -a -e /var/run/bbackupd.pid ]; then
 		/etc/init.d/bbackupd stop
 		RUN_DMON=1
 	fi
@@ -42,13 +42,13 @@
 post_install()
 {
 	# Creating conf dir
-	if [ ! -e $1/$CONF_DIR ]; then
-	    mkdir -p $1/$CONF_DIR && chmod 755 $1/$CONF_DIR
+	if [ ! -e "$1/$CONF_DIR" ]; then
+		mkdir -p "$1/$CONF_DIR" && chmod 755 "$1/$CONF_DIR"
 	fi
-	if [ ! -e $1/$DATA_DIR ]; then
-	    mkdir -p $1/$DATA_DIR && chmod 700 $1/$DATA_DIR
+	if [ ! -e "$1/$DATA_DIR" ]; then
+	    mkdir -p "$1/$DATA_DIR" && chmod 700 "$1/$DATA_DIR"
 	fi
-	if [ -z $1 ]; then
+	if [ -z "$1" ]; then
 		# Start daemon (if stopped by install)
 		if [ $RUN_DMON -eq 1 ]; then
 			/etc/init.d/bbackupd start
@@ -60,8 +60,8 @@
 
 pre_remove()
 {
-    # Stop daemon
-	if [ -z $1 ]; then
+	# Stop daemon
+	if [ -z "$1" ]; then
 		if [ -e /var/run/bbackupd.pid ]; then
 			/etc/init.d/bbackupd stop
 		fi
@@ -71,14 +71,15 @@
 post_remove()
 {
 	# Delete DATA directory
-	rm -rf $1/$DATA_DIR
+	rm -rf "$1/$DATA_DIR"
 
 	# Delete Client config files
-	rm -rf $1/$CONF_DIR/bbackupd*
+	rm -rf "$1/$CONF_DIR"/bbackupd*
 
 	# Delete CONF dir (if empty)
 	if [ $(ls -lA $CONF_DIR | wc -l) -eq 0 ]; then
-		echo -n "Removing $CONF_DIR..."
+		echo
+		action "Removing $CONF_DIR..."
 		rm -rf $1/$CONF_DIR
 		status
 	fi
diff -r d5f9f516b706 -r fca172c323cf boxbackup-server/receipt
--- a/boxbackup-server/receipt	Fri Dec 04 16:32:53 2015 +0200
+++ b/boxbackup-server/receipt	Fri Dec 04 17:18:44 2015 +0200
@@ -53,7 +53,7 @@
 pre_install()
 {
 	# Stop daemon
-	if [ -e /var/run/bbstored.pid ]; then
+	if [ -z "$1" -a -e /var/run/bbstored.pid ]; then
 		/etc/init.d/bbstored stop
 	fi
 }
@@ -67,7 +67,8 @@
 
 	# adduser BBUSER if needed
 	if  ! grep -q $BBUSER $1/etc/passwd; then
-		echo -n "Adding user '$BBUSER'..."
+		echo
+		action "Adding user '$BBUSER'..."
 		echo $BBUSER':x:505:505:BoxBackup Network Backup:/dev/null:/bin/false' >> $1/etc/passwd
 		echo $BBUSER':!:14013:0:99999:7:::' >> $1/etc/shadow
 		echo $BBUSER':x:505:' >> $1/etc/group
@@ -84,7 +85,7 @@
 
 	if [ ! -e $1$DATA_DIR/backup ]; then
 		# Creating backup dir
-		echo -n "Creating backup directory..."
+		action "Creating backup directory..."
 		mkdir -p $1$DATA_DIR/backup &&
 		chroot $1/ chown -R $BBUSER $DATA_DIR &&
 		chmod -R 700 $1$DATA_DIR
@@ -93,7 +94,7 @@
 
 	if [ ! -e $1$CONF_DIR/raidfile.conf ]; then
 		# RAID Setup
-		echo -n "Disabling deprecated userland RAID..."
+		action "Disabling deprecated userland RAID..."
 		chroot $1/ /usr/bin/raidfile-config $CONF_DIR 2048 $DATA_DIR 2>1 > /dev/null
 		status
 		chroot $1/ chown -R $BBUSER $CONF_DIR/raidfile.conf &&
@@ -102,7 +103,7 @@
 
 	if [ ! -e $1$CONF_DIR/bbstored.conf ]; then
 		# Setting hostname
-		echo -n "Setting hostname... "
+		action "Setting hostname... "
 		if [ $(chroot $1/ hostname -f 2>1 > /dev/null;echo $?) -eq 0 ]; then
 			HOSTNAME=$(chroot $1/ hostname -f)
 		fi
@@ -113,17 +114,17 @@
 		echo $HOSTNAME
 
 		# Setting up the CA environment
-		echo -n "Creating certificates..."
+		action "Creating certificates..."
 		chroot $1/ /usr/bin/bbstored-certs $CA_DIR init 2>1 > /dev/null
 		status
 
 		# Generate server certificate request
-		echo -n "Generate server certificate request..."
+		action "Generate server certificate request..."
 		chroot $1/ bbstored-config $CONF_DIR $HOSTNAME $BBUSER 2>1 > /dev/null
 		status
 
 		# Sign the server certificate
-		echo -n "Sign the server certificate..."
+		action "Sign the server certificate..."
 		chroot $1/ openssl x509 -req -sha1 -extensions usr_crt \
 			-in $CONF_DIR/$BBUSER/${HOSTNAME}-csr.pem \
 			-CA $CA_DIR/roots/serverCA.pem \
@@ -133,10 +134,10 @@
 		status
 
 		# Preparing the server certificates
-		echo -n "Installing server certificate..."
+		action "Installing server certificate..."
 		cp -a $1$CA_DIR/servers/${HOSTNAME}-cert.pem $1$CONF_DIR/$BBUSER
 		status
-		echo -n "Installing client certificate..."
+		action "Installing client certificate..."
 		cp -a $1$CA_DIR/roots/clientCA.pem $1$CONF_DIR/$BBUSER
 		status
 
@@ -165,20 +166,21 @@
 
 post_remove()
 {
+	echo
 	if  grep -q $BBUSER $1/etc/passwd; then
-		echo -n "Removing $BBUSER user..."
+		action "Removing $BBUSER user..."
 		deluser bbstored
 		status
 	fi
 	# Delete data
 	if [ -e $DATA_DIR ]; then
-		echo -n "Removing all backup data..."
+		action "Removing all backup data..."
 		rm -r $DATA_DIR
 		status
 	fi
 	# Delete bbstored conf files
 	if [ -e $CONF_DIR/bbstored.conf ]; then
-		echo -n "Removing config files..."
+		action "Removing config files..."
 		rm -rf $CONF_DIR/bbstored
 		rm -f $CONF_DIR/raidfile.conf
 		rm -f $CONF_DIR/bbstored.conf
@@ -186,13 +188,13 @@
 	fi
 	# Delete certificates
 	if [ -e $CA_DIR ]; then
-		echo -n "Removing certificates..."
-        rm -r $CA_DIR
+		action "Removing certificates..."
+		rm -r $CA_DIR
 		status
-    fi
+	fi
 	# Delete $CONF_DIR (if empty)
 	if [ $(ls -lA $CONF_DIR | wc -l) -eq 0 ]; then
-		echo -n "Removing $CONF_DIR..."
+		action "Removing $CONF_DIR..."
 		rm -r $CONF_DIR
 		status
 	fi
diff -r d5f9f516b706 -r fca172c323cf libgtop-dev/receipt
--- a/libgtop-dev/receipt	Fri Dec 04 16:32:53 2015 +0200
+++ b/libgtop-dev/receipt	Fri Dec 04 17:18:44 2015 +0200
@@ -7,9 +7,9 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.gnome.org"
+
 WANTED="libgtop"
-
-DEPENDS="pkg-config"
+DEPENDS="libgtop pkg-config"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -19,4 +19,3 @@
 	cp -a $install/usr/lib/*a $fs/usr/lib
 	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
 }
-
diff -r d5f9f516b706 -r fca172c323cf libsecret-dev/receipt
--- a/libsecret-dev/receipt	Fri Dec 04 16:32:53 2015 +0200
+++ b/libsecret-dev/receipt	Fri Dec 04 17:18:44 2015 +0200
@@ -6,10 +6,12 @@
 SHORT_DESC="libsecret Secret Service API devel files."
 MAINTAINER="devl547@gmail.com"
 LICENSE="LGPL2.1"
-WANTED="libsecret"
 WEB_SITE="http://gnome.org"
 HOST_ARCH="i486 arm"
 
+WANTED="libsecret"
+DEPENDS="libsecret"
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
diff -r d5f9f516b706 -r fca172c323cf wget/receipt
--- a/wget/receipt	Fri Dec 04 16:32:53 2015 +0200
+++ b/wget/receipt	Fri Dec 04 17:18:44 2015 +0200
@@ -42,6 +42,7 @@
 If you want to use the busybox wget, do (as root):
 \033[1m ln -s /bin/busybox /usr/bin/wget \033[0m
 "
+	:
 }
 
 post_remove()