ripgrep.bash: fail if no ripgrep

bevry · Sep 1, 2023 · 235e520 · 235e520
1 parent 23d187a
commit 235e520
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/commands/brew b/commands/brew
@@ -20,7 +20,7 @@ function brew() (
 	# get the homebrew binary
 	local bin="${HOMEBREW_PREFIX-}/bin/brew"
 	if test ! -x "$bin"; then
-		echo-style --error='Homebrew is not installed.' ' ' --notice="Install it with:" ' ' --code='setup-mac-brew' >/dev/stderr
+		echo-style --error='Homebrew is not installed.' ' ' --notice='Install it with:' ' ' --code='setup-mac-brew' >/dev/stderr
 		# ^ don't use get-installer, as bash v5 may not exist yet
 		return 74 # EPROGUNAVAIL 74 RPC prog. not avail
 	fi

diff --git a/sources/ripgrep.bash b/sources/ripgrep.bash
@@ -8,6 +8,10 @@ if test -z "${RIPGREP_BIN_PATH-}"; then
 	function rg {
 		local ripgrep_bin_path
 		ripgrep_bin_path="$(type -P rg)"
+		if test -z "$ripgrep_bin_path"; then
+			echo-style --error='ripgrep is required to continue, and was not able to be auto-installed.' ' ' --notice='Install it with:' ' ' --code='setup-util-ripgrep' >/dev/stderr
+			return 74 # EPROGUNAVAIL 74 RPC prog. not avail
+		fi
 		"$ripgrep_bin_path" --no-line-number --color never "$@"
 	}
 fi