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

This commit is contained in:

Dag-Erling Smørgrav

2025-11-27 19:07:15 +01:00

parent 4e22cd3bf0

commit b3e53f9fff

1 changed files with 14 additions and 0 deletions

									
										tools/tools/git/git-arc.sh
									
		+14
		
												View File
												
				@@ -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 so