--- a/debian/postinst	Thu May 29 15:55:19 2003 +0100
+++ b/debian/postinst	Tue Jun 03 22:17:53 2003 +0100
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: postinst 537 2003-05-29 14:44:56Z godisch $
+# $Id: postinst 540 2003-06-03 21:17:53Z godisch $
 
 set -e
 
@@ -12,18 +12,18 @@
 defexpire_default=14
 
 if dpkg --compare-versions "$2" lt-nl 1.1.2-1; then
-	echo ""
+	echo
 	echo "/etc/noffle/conf moved to $server_config, /etc/noffle/conf.debian"
 	echo "moved to $debian_config. /etc/noffle and /var/log/noffle are not"
 	echo "used any longer, you may remove them. noffle expiration logs are"
 	echo "still available through syslog."
-	echo ""
+	echo
 	sleep 2
 	mv -f /etc/noffle/conf $server_config || :
 	mv -f /etc/noffle/conf.debian $debian_config || :
 	mv -f /etc/noffle/conf.old $server_config.old 2> /dev/null || :
 	mv -f /etc/noffle/conf.debian.old $debian_config.old 2> /dev/null || :
-	rmdir /etc/noffle || :
+	rmdir --ignore-fail-on-non-empty /etc/noffle
 fi
 
 if dpkg --compare-versions "$2" eq 1.1.2-1; then
@@ -39,7 +39,9 @@
 	if [ "$RET" = true ]; then
 		db_get noffle/port
 		port="$RET"
-		[ -z "$port" -o "$port" = 119 ] && port=nntp || :
+		if [ -z "$port" -o "$port" = 119 ]; then
+			port=nntp
+		fi
 		# maybe disabled only, e.g. dpkg -r noffle
 		update-inetd --remove "/usr/bin/noffle -r" || :
 		update-inetd --group MAIL --add "$port\tstream\ttcp\tnowait\tnews\t/usr/sbin/tcpd /usr/bin/noffle -r"
@@ -117,11 +119,11 @@
 fi
 
 if [ -z "$2" ]; then
-	echo ""
+	echo
 	echo "You need to query your parent NNTP server manually for a group overview"
 	echo "and descriptions. Have a look at /usr/share/doc/noffle/README.Debian for"
 	echo "information how to do this."
-	echo ""
+	echo
 	sleep 2
 fi