Date: Sat, 4 Feb 2023 19:14:30 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 17720d0bd0e8 - main - Strip trailing slashes from DESTDIR Message-ID: <202302041914.314JEUaI061763@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=17720d0bd0e8980d9cc87977eb2ec87d103f875b commit 17720d0bd0e8980d9cc87977eb2ec87d103f875b Author: Marius van Witzenburg <contact@mariusvw.com> AuthorDate: 2022-04-10 20:12:50 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2023-02-04 19:11:02 +0000 Strip trailing slashes from DESTDIR Solves duplicate slashes in paths Scanning //usr/share/certs/trusted for certificates... Scanning //usr/local/share/certs for certificates... Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/595 --- usr.sbin/certctl/certctl.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh index 99fff8848188..d650e8919395 100755 --- a/usr.sbin/certctl/certctl.sh +++ b/usr.sbin/certctl/certctl.sh @@ -278,6 +278,8 @@ while getopts D:d:M:nUv flag; do done shift $(( $OPTIND - 1 )) +DESTDIR=${DESTDIR%/} + : ${METALOG:=${DESTDIR}/METALOG} INSTALLFLAGS= [ $UNPRIV -eq 1 ] && INSTALLFLAGS="-U -M ${METALOG} -D ${DESTDIR}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302041914.314JEUaI061763>