From b151f12f8e12511f967454ca3bf61f995dcb83cc Mon Sep 17 00:00:00 2001
From: kre <kre@NetBSD.org>
Date: Mon, 25 Dec 2023 08:37:08 +0000
Subject: [PATCH] Do away with the obsolete text(1) -a operator, use sh &&
 instead. Prefer sh ! operator over test's ! (less question what it means). A
 few minor formatting changes.

---
 etc/rc.d/postfix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/rc.d/postfix b/etc/rc.d/postfix
index 9d1d52f9990e..d267ff6e3745 100755
--- a/etc/rc.d/postfix
+++ b/etc/rc.d/postfix
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postfix,v 1.19 2019/08/09 10:05:44 rin Exp $
+# $NetBSD: postfix,v 1.20 2023/12/25 08:37:08 kre Exp $
 #
 
 # PROVIDE: mail
@@ -53,7 +53,7 @@ postfix_precmd()
 		case "$1" in
 		hash)
 			if [ -f "$2.db" ]; then
-				if [ ! "$2" -ot "$2.db" ]; then
+				if ! [ "$2" -ot "$2.db" ]; then
 					_rebuild "$2" "out of date"
 				fi
 			else
@@ -85,8 +85,8 @@ check_use_postfix()
 	    echo YES
 	else
 	    echo "WARNING: default postfix not used as not selected in mailer.conf" >&2
-	    if [ "${_mta_path}" = "${_sendmail_path}" -a \
-		! -x "${_mta_path}" ]; then
+	    if [ "${_mta_path}" = "${_sendmail_path}" ] &&
+	     ! [ -x "${_mta_path}" ]; then
 		echo "WARNING: mailer.conf points to the removed sendmail" >&2
 		echo "update /etc/mailer.conf to get a working mailer configuration" >&2
 	    fi