Date: Thu, 27 Nov 2025 18:07:35 +0000 From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: b3e53f9fff11 - main - git-arc: Don't require devel/arcanist Message-ID: <69289367.a7f0.52d52c35@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b3e53f9fff11e2e6289f5c69ad08f5acd727abd6 commit b3e53f9fff11e2e6289f5c69ad08f5acd727abd6 Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2025-11-27 18:07:15 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2025-11-27 18:07:15 +0000 git-arc: Don't require devel/arcanist Instead of invoking just “arc”, which requires devel/arcanist, which conflicts with archivers/arc, invoke the underlying script installed by devel/arcanist-lib. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53942 --- tools/tools/git/git-arc.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index fa618cdcbc22..f33a73334799 100644 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -171,6 +171,20 @@ get_bool_config() test "$(git config --bool --get $1 2>/dev/null || echo $2)" != "false" } +# +# Invoke the actual arc command. This allows us to only rely on the +# devel/arcanist-lib port, which installs the actual script, rather than +# the devel/arcanist-port, which installs a symlink in ${LOCALBASE}/bin +# but conflicts with the archivers/arc port. +# +: ${LOCALBASE:=$(sysctl -n user.localbase)} +: ${LOCALBASE:=/usr/local} +: ${ARC_CMD:=${LOCALBASE}/lib/php/arcanist/bin/arc} +arc() +{ + ${ARC_CMD} "$@" +} + # # Filter the output of call-conduit to remove the warnings that are generated # for some installations where openssl module is mysteriously installed twice sohelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69289367.a7f0.52d52c35>