From nobody Sat Feb 04 19:14:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P8Mdz22Dvz3nlGJ; Sat, 4 Feb 2023 19:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P8Mdz1T2yz3K4t; Sat, 4 Feb 2023 19:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675538071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KMC/rBflyVkpg642HQmPUyslv5Gj92wV082qy+mcoWw=; b=vX51OFne0P8/P6DTwQhC1QU6J41hOsgd4BJOwb54njbkw+d4OZxRM32xSnKBOYrc3Xv72i MJV3c6q+U85njDdSsnR9SumeBtFJpu0VOl92tvhExBtR2H8dQSNQ3BqPPqgTafxYlCJLXO 4612rcl9GvLjl1tk1BtOJu8KwJsibfDlR5+C2t+RvegRtASEwh2WHFiTQr7j3fJ2blMT3N n2KEWAEitDIkpMzq2I4TtX5fkD59vnrsqinlea3qLdz7pl0G4J4KPPCvoJyen1aNwW3Mlw Qs4QxLBK4LW35R3toB8GFrtZV7PhRkIyJS2SOU9eHkl6SeY9H8pwR5EGd4BWow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675538071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KMC/rBflyVkpg642HQmPUyslv5Gj92wV082qy+mcoWw=; b=sgU7vyaKYo6e+fQudFuAPCWv8XDKbCHPXKdGXlpZyZg9a0IQDTyLaxdDHLah6OXPa2xprg MqA+xB+qFhLARHahUfxem86hZ1nene1Ozp6y/7187dEMb3HFBGprKJE9OLcHS/dlUWSUwV z/CPGR4+FO3I08qBSGKUPgwjL1vYPyOFteR4115f3nSLXLYtWWR2artmb3xH5I+/jFJ9dd Is1T7/57/ssLHmc3tg9CHrGT5l6qE+BemmWZyqzEZQ9JDR9N/ruoOvSrkjckR+fI+ww7/S KDzWlA2QB93VtVecwjRHrSfyybthfukwLwh1aRcZjrPxhLhVWAMVSS7wNBOJAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675538071; a=rsa-sha256; cv=none; b=MXIl7B8W0S9vh8/E0t+7P+Ehz7nlPMm/yTZZZeeLWmuupugBT7JQBGVLg2eTUd/tzpaelO 1QZCpTWPzp4nF7JIk1EqFFN0rnPcsniQpekyppYaMMjqkaKRBRb7GXnhO8+6p/+1eLdabv GXnH9/gGk5tuVXzeo46742F7koJLSOBMIMsejmVYCrewdOxUH6lBVRN8jhKQ//GPY+Owwu CfmoKdXzUx5DkijiV6wA0EWQzSr3Z3/fcPodIGdxc5KADr9KBYeyO2cHTy+3djW2BSvGxn veGwKkWpgxsfzAbXsbaAcySfjpVzRfUhmsUqca8pZNw3AhtcOzXaKryVrn6reQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P8Mdz0WdnzRCw; Sat, 4 Feb 2023 19:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 314JEUn9061764; Sat, 4 Feb 2023 19:14:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 314JEUaI061763; Sat, 4 Feb 2023 19:14:30 GMT (envelope-from git) Date: Sat, 4 Feb 2023 19:14:30 GMT Message-Id: <202302041914.314JEUaI061763@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 17720d0bd0e8 - main - Strip trailing slashes from DESTDIR List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17720d0bd0e8980d9cc87977eb2ec87d103f875b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=17720d0bd0e8980d9cc87977eb2ec87d103f875b commit 17720d0bd0e8980d9cc87977eb2ec87d103f875b Author: Marius van Witzenburg AuthorDate: 2022-04-10 20:12:50 +0000 Commit: Warner Losh 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}"