From 17720d0bd0e8980d9cc87977eb2ec87d103f875b Mon Sep 17 00:00:00 2001 From: Marius van Witzenburg Date: Sun, 10 Apr 2022 22:12:50 +0200 Subject: [PATCH] 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}"