svn commit: r353002 - in head/usr.sbin: etcupdate mergemaster

[Kyle Evans]

Author: kevans
Date: Wed Oct  2 12:46:28 2019
New Revision: 353002
URL: https://svnweb.freebsd.org/changeset/base/353002

Log:
  Unbreak etcupdate(8) and mergemaster(8) after r352950
  
  r352950 introduced improper case fall-through for shell scripts. Fix it with
  a pipe.
  
  Reported by:	lwhsu, David Wolfskill

Modified:
  head/usr.sbin/etcupdate/etcupdate.sh
  head/usr.sbin/mergemaster/mergemaster.sh

Modified: head/usr.sbin/etcupdate/etcupdate.sh
==============================================================================
--- head/usr.sbin/etcupdate/etcupdate.sh	Wed Oct  2 12:45:39 2019	(r353001)
+++ head/usr.sbin/etcupdate/etcupdate.sh	Wed Oct  2 12:46:28 2019	(r353002)
@@ -595,8 +595,7 @@ post_install_file()
 				NEWALIAS_WARN=yes
 			fi
 			;;
-		/usr/share/certs/trusted/*)
-		/usr/share/certs/blacklisted/*)
+		/usr/share/certs/trusted/* | /usr/share/certs/blacklisted/*)
 			log "certctl rehash"
 			if [ -z "$dryrun" ]; then
 				env DESTDIR=${DESTDIR} certctl rehash >&3 2>&1

Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh	Wed Oct  2 12:45:39 2019	(r353001)
+++ head/usr.sbin/mergemaster/mergemaster.sh	Wed Oct  2 12:46:28 2019	(r353002)
@@ -883,8 +883,7 @@ mm_install () {
     /etc/mail/aliases)
       NEED_NEWALIASES=yes
       ;;
-    /usr/share/certs/trusted/*)
-    /usr/share/certs/blacklisted/*)
+    /usr/share/certs/trusted/* | /usr/share/certs/blacklisted/*)
       NEED_CERTCTL=yes
       ;;
     /etc/login.conf)