git: b799d38a2ad1 - main - certctl: replace hardcoded uses of /usr/local

[Kyle Evans]

The branch main has been updated by kevans:

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

commit b799d38a2ad10ec84c8ffa4a554a1816465c0d12
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-09 04:06:42 +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).
    
    MFC after:      3 days (note: just use a literal /usr/local default)
---
 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..c2f9c7dc8438 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:=$(sysctl -n user.localbase)}
+: ${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}