# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1449239573 -7200
# Node ID d5f9f516b7065abff070c5b406b2499e16d9cfe2
# Parent  8031c3523ad81f0b99e8d91930bc7a766849e1a9
Change messaging in {pre|post}_{install|remove}(): wget and a* packages

diff -r 8031c3523ad8 -r d5f9f516b706 acpid/receipt
--- a/acpid/receipt	Fri Dec 04 13:21:56 2015 +0100
+++ b/acpid/receipt	Fri Dec 04 16:32:53 2015 +0200
@@ -42,15 +42,13 @@
 # Pre and post remove commands for Tazpkg
 post_install()
 {
-	local root
-	root=$1
-	if [ -z "$root" ]; then
+	if [ -z "$1" ]; then
 		/etc/init.d/acpid start || continue
 	fi
-	if ! grep -q ^ACPID_OPTIONS $root/etc/daemons.conf; then
-		echo '# ACPI daemon options.' >> $root/etc/daemons.conf
-		echo 'ACPID_OPTIONS=""' >> $root/etc/daemons.conf
-		echo '' >> $root/etc/daemons.conf
+	if ! grep -q ^ACPID_OPTIONS "$1/etc/daemons.conf"; then
+		echo '# ACPI daemon options.' >> "$1/etc/daemons.conf"
+		echo 'ACPID_OPTIONS=""' >> "$1/etc/daemons.conf"
+		echo '' >> "$1/etc/daemons.conf"
 	fi
 }	
 
diff -r 8031c3523ad8 -r d5f9f516b706 ajaxterm/receipt
--- a/ajaxterm/receipt	Fri Dec 04 13:21:56 2015 +0100
+++ b/ajaxterm/receipt	Fri Dec 04 16:32:53 2015 +0200
@@ -71,7 +71,8 @@
 	fi
 	[ -z "$1" ] && /etc/init.d/ajaxterm start
 	[ ! -f $1/usr/lib/lighttpd/mod_proxy.so -a \
-	  ! -f $1/etc/apache/httpd.conf ] && cat <<EOT
+	  ! -f $1/etc/apache/httpd.conf ] &&
+	  [ -z "$quiet" ] && cat <<EOT
 --------
 You should install either lighttpd
 # tazpkg get-install lighttpd-ssl ; tazpkg get-install lighttpd-modules
@@ -82,4 +83,3 @@
 --------
 EOT
 }
-
diff -r 8031c3523ad8 -r d5f9f516b706 alpine/receipt
--- a/alpine/receipt	Fri Dec 04 13:21:56 2015 +0100
+++ b/alpine/receipt	Fri Dec 04 16:32:53 2015 +0200
@@ -36,18 +36,13 @@
 post_install()
 {
 	# link old libldap libraries
-	echo -n "Linking libraries..."
-	cd $1/usr/lib
+	cd "$1/usr/lib"
 	ln -s liblber-2.4.so.2.4.2 liblber-2.3.so.0
 	ln -s libldap-2.4.so.2.4.2 libldap-2.3.so.0
-	status
 }
 
 post_remove()
 {
-	echo -n "Removing linked libraries..."
 	rm -f /usr/lib/liblber-2.3.so.0
 	rm -f /usr/lib/libldap-2.3.so.0
-	status
 }
-
diff -r 8031c3523ad8 -r d5f9f516b706 apache/receipt
--- a/apache/receipt	Fri Dec 04 13:21:56 2015 +0100
+++ b/apache/receipt	Fri Dec 04 16:32:53 2015 +0200
@@ -70,7 +70,6 @@
 # We stop the server by default in case of upgarde.
 pre_install()
 {
-	echo "Processing pre-install commands..."
 	[ -z "$1" ] && [ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
 }
 
@@ -79,7 +78,7 @@
 	local lang=$(. /etc/locale.conf 2>/dev/null; echo ${LANG#*_})
 	local tz=$(cat /etc/TZ 2>/dev/null)
 	local hostname=$(cat /etc/hostname 2>/dev/null)
-	echo "Processing post-install commands..."
+
 	# Just in case.
 	chown www.www $1/var/log/$PACKAGE
 	ping -c 2 $(hostname) > /dev/null 2>&1 || 
@@ -95,11 +94,12 @@
 
 
 EOT
+	[ -z "$quiet" ] && echo # Start new line
 	( cd $1/$INSTALLED/ ; grep -l /etc/apache/conf.d/ */receipt ) | \
 	while read file; do
 		pkg=$(dirname $file)
 		[ "$pkg" = "$PACKAGE" ] && continue
-		echo "Reconfiguring $pkg for $PACKAGE..."
+		[ -z "$quiet" ] && echo "Reconfiguring $pkg for $PACKAGE..."
 		tazpkg reconfigure $pkg
 	done
 	[ -f $1/etc/php.ini ] && tazpkg get-install php-apache --root=$1
diff -r 8031c3523ad8 -r d5f9f516b706 atril/receipt
--- a/atril/receipt	Fri Dec 04 13:21:56 2015 +0100
+++ b/atril/receipt	Fri Dec 04 16:32:53 2015 +0200
@@ -44,14 +44,7 @@
 	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
 }
 
-post_install()
-{
-	echo "Processing post-install commands..."
-	chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
 post_remove()
 {
-	echo "Processing post-remove commands..."
-	chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 }
diff -r 8031c3523ad8 -r d5f9f516b706 aufs/receipt
--- a/aufs/receipt	Fri Dec 04 13:21:56 2015 +0100
+++ b/aufs/receipt	Fri Dec 04 16:32:53 2015 +0200
@@ -55,12 +55,10 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	echo "Processing post-install commands..."
-	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
+	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
 }
 
 post_remove()
 {
-	echo "Processing post-remove commands..."
-	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
+	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
 }
diff -r 8031c3523ad8 -r d5f9f516b706 autoblog/receipt
--- a/autoblog/receipt	Fri Dec 04 13:21:56 2015 +0100
+++ b/autoblog/receipt	Fri Dec 04 16:32:53 2015 +0200
@@ -28,8 +28,8 @@
 	mkdir -p $src 2> /dev/null
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
 {
 	mkdir -p $fs/var/www/$PACKAGE
 	cp $SOURCES_REPOSITORY/$_TARBALL $fs/var/www/$PACKAGE/index.php
@@ -42,5 +42,5 @@
 	mytz="$(cat $1/etc/TZ)"
 	[ -n "$mytz" ] && sed  -i "s|Europe/Paris|$mytz|" $1/var/www/$PACKAGE/index.php
 	chown -R www $1/var/www/$PACKAGE
-	echo "You should update /var/www/$PACKAGE/vvb.ini now ..."
+	[ -z "$quiet" ] && echo "You should update /var/www/$PACKAGE/vvb.ini now..."
 }
diff -r 8031c3523ad8 -r d5f9f516b706 autofs/receipt
--- a/autofs/receipt	Fri Dec 04 13:21:56 2015 +0100
+++ b/autofs/receipt	Fri Dec 04 16:32:53 2015 +0200
@@ -40,5 +40,5 @@
 # Pre and post install commands for Tazpkg.
 post_install()
 {
-	mkdir -p $1/mnt/auto 2> /dev/null
+	mkdir -p "$1/mnt/auto" 2>/dev/null
 }
diff -r 8031c3523ad8 -r d5f9f516b706 avant-window-navigator/receipt
--- a/avant-window-navigator/receipt	Fri Dec 04 13:21:56 2015 +0100
+++ b/avant-window-navigator/receipt	Fri Dec 04 16:32:53 2015 +0200
@@ -68,6 +68,7 @@
 post_install()
 {
   # ln missing icons
+  # FIXME
     ln -sf $1/usr/share/icons/SliTaz/16x16/actions/go-up.png $1/usr/share/icons/SliTaz/16x16/actions/gtk-sort-ascending.png
     ln -sf $1/usr/share/icons/SliTaz/16x16/actions/go-down.png $1/usr/share/icons/SliTaz/16x16/actions/gtk-sort-descending.png
 }
diff -r 8031c3523ad8 -r d5f9f516b706 awesome/receipt
--- a/awesome/receipt	Fri Dec 04 13:21:56 2015 +0100
+++ b/awesome/receipt	Fri Dec 04 16:32:53 2015 +0200
@@ -48,19 +48,17 @@
 
 post_install()
 {
-	res=`cat $1/etc/slim.conf | grep ^session | sed s/"sessions. *"//`
+	res=$(cat $1/etc/slim.conf | grep ^session | sed s/"sessions. *"//)
 	# Adding WM to SLIM available sessions.
 	if ! echo "$res" | grep -q $PACKAGE; then
-		echo -n "Adding $PACKAGE to /etc/slim.conf..."
-		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" /etc/slim.conf
-		status
+		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" "$1/etc/slim.conf"
 	fi
 }
 
 post_remove()
 {
 	# Remove WM from SLIM available sessions.
-	if grep -q $PACKAGE $1/etc/slim.conf; then
-		sed -i s/,$PACKAGE// $1/etc/slim.conf
+	if grep -q $PACKAGE "$1/etc/slim.conf"; then
+		sed -i s/,$PACKAGE// "$1/etc/slim.conf"
 	fi
 }
diff -r 8031c3523ad8 -r d5f9f516b706 awstats-hotspot/receipt
--- a/awstats-hotspot/receipt	Fri Dec 04 13:21:56 2015 +0100
+++ b/awstats-hotspot/receipt	Fri Dec 04 16:32:53 2015 +0200
@@ -19,10 +19,11 @@
 
 post_install()
 {
-	chroot $1/ /usr/bin/loghotspot.sh --install
+	chroot "$1/" /usr/bin/loghotspot.sh --install
 }
 
 post_remove()
 {
+	# FIXME root
 	grep -l loghotspot.sh /etc/awstats/*.conf | xargs rm -f
 }
diff -r 8031c3523ad8 -r d5f9f516b706 awstats/receipt
--- a/awstats/receipt	Fri Dec 04 13:21:56 2015 +0100
+++ b/awstats/receipt	Fri Dec 04 16:32:53 2015 +0200
@@ -61,7 +61,6 @@
 
 post_install()
 {
-	echo "Processing post-install commands..."
 	# Set lighttpd or apache config
 	if [ -f $1/etc/apache/httpd.conf ]; then
 		if [ ! -f $1/etc/apache/conf.d/awstats.conf ]; then
@@ -87,7 +86,8 @@
 			/etc/init.d/lighttpd restart
 		fi
 	fi
-	cat <<EOT
+	[ -z "$quiet" ] && cat <<EOT
+
 You should add in your crontab something like;
 
 0 0 * * * /usr/share/awstats/extras/update
@@ -99,11 +99,11 @@
 		echo "Remove orphan dirctories."
 		[ -d /usr/share/awstats ] && rm -rf /usr/share/awstats
 
-		# 
+		# FIXME
 		echo "All database and configuratoin files will be removed"
 		echo -n "Please confirm removing (y/N) : "; read answer
 
-		case $answer in 
+		case $answer in
 			y|Y)
 				rm -rf /var/lib/awstats
 				rm -rf /etc/awstats
diff -r 8031c3523ad8 -r d5f9f516b706 wget/receipt
--- a/wget/receipt	Fri Dec 04 13:21:56 2015 +0100
+++ b/wget/receipt	Fri Dec 04 16:32:53 2015 +0200
@@ -37,24 +37,14 @@
 # Post install rules.
 post_install()
 {
-	echo -e "
+	[ -z "$quiet" ] && echo -e "
 wget is in conflict with the busybox wget.
 If you want to use the busybox wget, do (as root):
 \033[1m ln -s /bin/busybox /usr/bin/wget \033[0m
 "
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-pre_install()
-{
-	qaction "Removing Busybox wget replaced utility..."
-	rm -f $1/usr/bin/wget
-	qstatus
-}
-
 post_remove()
 {
-	ln -s /bin/busybox $1/usr/bin/wget
+	ln -s /bin/busybox "$1/usr/bin/wget"
 }