--- a/debian/postinst	Wed Jun 25 16:34:53 2003 +0100
+++ b/debian/postinst	Wed Jun 25 16:41:02 2003 +0100
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: postinst 571 2003-06-20 17:04:24Z godisch $
+# $Id: postinst 586 2003-06-25 15:41:02Z godisch $
 
 set -e
 
@@ -16,17 +16,17 @@
 	echo "still available through syslog."
 	echo
 	sleep 2
-	mv -fb /etc/noffle/conf /etc/news/noffle.conf || :
-	mv -fb /etc/noffle/conf.debian /etc/default/noffle || :
-	mv -fb /etc/noffle/conf.old /etc/news/noffle.conf.old 2> /dev/null || :
-	mv -fb /etc/noffle/conf.debian.old /etc/default/noffle.old 2> /dev/null || :
-	rmdir --ignore-fail-on-non-empty /etc/noffle
+	mv -fb /etc/noffle/conf /etc/news/noffle.conf || true
+	mv -fb /etc/noffle/conf.debian /etc/default/noffle || true
+	mv -fb /etc/noffle/conf.old /etc/news/noffle.conf.old 2> /dev/null || true
+	mv -fb /etc/noffle/conf.debian.old /etc/default/noffle.old 2> /dev/null || true
+	rmdir /etc/noffle 2> /dev/null || true
 fi
 
 if dpkg --compare-versions "$2" eq 1.1.2-1; then
 	# 1.1.2-1 was in unstable only, don't notify
-	mv -fb /etc/noffle.conf /etc/news/noffle.conf || :
-	mv -fb /etc/noffle.conf.old /etc/news/noffle.conf.old 2> /dev/null || :
+	mv -fb /etc/noffle.conf /etc/news/noffle.conf || true
+	mv -fb /etc/noffle.conf.old /etc/news/noffle.conf.old 2> /dev/null || true
 fi
 
 if [ -e /usr/share/debconf/confmodule ]; then
@@ -84,7 +84,7 @@
 else
 	ucf --three-way /usr/share/noffle/noffle.conf /etc/news/noffle.conf < /dev/tty
 	ucf --three-way /usr/share/noffle/conf.debian /etc/default/noffle < /dev/tty
-	port="`grep "/usr/bin/noffle -r" /etc/inetd.conf 2> /dev/null | sed 's/[[:space:]].*$//'`" || :
+	port="`grep "/usr/bin/noffle -r" /etc/inetd.conf 2> /dev/null | sed 's/[[:space:]].*$//'`" || true
 	if [ "$port" ]; then
 		update-inetd --enable "$port"
 	else