git: 8ec319d7922c - stable/12 - certctl: replace hardcoded uses of /usr/local

[Kyle Evans]

The branch stable/12 has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=8ec319d7922c6e3e95d79882f2103768b96ee95a

commit 8ec319d7922c6e3e95d79882f2103768b96ee95a
Author:     Kyle Evans <kevans at FreeBSD.org>
AuthorDate: 2021-01-09 04:00:41 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-01-24 02:54:50 +0000

    certctl: replace hardcoded uses of /usr/local
    
    Use the new user.localbase sysctl here as well, to reduce the number of
    hardcoded localbase by one (1).
    
    (cherry picked from commit b799d38a2ad10ec84c8ffa4a554a1816465c0d12)
---
 usr.sbin/certctl/certctl.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh
index f317064a6dfe..b8bec6fff385 100755
--- a/usr.sbin/certctl/certctl.sh
+++ b/usr.sbin/certctl/certctl.sh
@@ -264,8 +264,9 @@ shift $(( $OPTIND - 1 ))
 : ${METALOG:=${DESTDIR}/METALOG}
 INSTALLFLAGS=
 [ $UNPRIV -eq 1 ] && INSTALLFLAGS="-U -M ${METALOG} -D ${DESTDIR}"
-: ${TRUSTPATH:=${DESTDIR}/usr/share/certs/trusted:${DESTDIR}/usr/local/share/certs:${DESTDIR}/usr/local/etc/ssl/certs}
-: ${BLACKLISTPATH:=${DESTDIR}/usr/share/certs/blacklisted:${DESTDIR}/usr/local/etc/ssl/blacklisted}
+: ${LOCALBASE:=/usr/local}
+: ${TRUSTPATH:=${DESTDIR}/usr/share/certs/trusted:${DESTDIR}${LOCALBASE}/share/certs:${DESTDIR}${LOCALBASE}/etc/ssl/certs}
+: ${BLACKLISTPATH:=${DESTDIR}/usr/share/certs/blacklisted:${DESTDIR}${LOCALBASE}/etc/ssl/blacklisted}
 : ${CERTDESTDIR:=${DESTDIR}/etc/ssl/certs}
 : ${BLACKLISTDESTDIR:=${DESTDIR}/etc/ssl/blacklisted}