D53942.id167188.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D53942.id167188.diff
View Options

	diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh
	old mode 100644
	new mode 100755
	--- a/tools/tools/git/git-arc.sh
	+++ b/tools/tools/git/git-arc.sh
	@@ -171,6 +171,20 @@
	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
	@@ -772,7 +786,7 @@

	[ $# -ge 1 ] \|\| err_usage

	-which arc >/dev/null 2>&1 \|\| err "arc is required, install devel/arcanist"
	+[ -x "${ARC_CMD}" ] \|\| err "arc is required, install devel/arcanist-lib"
	which jq >/dev/null 2>&1 \|\| err "jq is required, install textproc/jq"

	if [ "$VERBOSE" ]; then