From 918afd63852d8d80c9e390b4aca7950e2d3f8c2d Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Wed, 18 Dec 2024 21:02:20 -0700
Subject: [PATCH] `spack external find grep` on Linux AND macOS (#48134)

* Configure 'spack external find grep'
* Fix style for finding external grep
* Remove unused 're' Python module from grep
---
 .../repos/builtin/packages/grep/package.py    | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/var/spack/repos/builtin/packages/grep/package.py b/var/spack/repos/builtin/packages/grep/package.py
index a8f2927469f..58fff205117 100644
--- a/var/spack/repos/builtin/packages/grep/package.py
+++ b/var/spack/repos/builtin/packages/grep/package.py
@@ -2,7 +2,6 @@
 # Spack Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
-import re
 
 from spack.package import *
 
@@ -16,8 +15,6 @@ class Grep(AutotoolsPackage):
 
     license("GPL-3.0-or-later")
 
-    executables = ["^grep$"]
-
     version("3.11", sha256="1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab")
     version("3.10", sha256="24efa5b595fb5a7100879b51b8868a0bb87a71c183d02c4c602633b88af6855b")
     version("3.9", sha256="abcd11409ee23d4caf35feb422e53bbac867014cfeed313bb5f488aca170b599")
@@ -33,13 +30,23 @@ class Grep(AutotoolsPackage):
     depends_on("pcre2", when="@3.8:+pcre")
     depends_on("pcre", when="@:3.7+pcre")
 
+    # For spack external find
+    executables = ["^grep$"]
+
     @classmethod
     def determine_version(cls, exe):
-        output = Executable(exe)("--version", output=str, error=str)
-        # Example output:
-        #     grep (GNU grep) 3.11
-        match = re.search(r"^grep \(GNU grep\) ([0-9.]+)", output)
-        return match.group(1) if match else None
+        version_string = Executable(exe)("--version", output=str, error=str).split("\n")[0]
+        # Linux
+        if "GNU grep" in version_string:
+            return version_string.lstrip("grep (GNU grep)").strip()
+        # macOS
+        elif "BSD grep, GNU compatible" in version_string:
+            return (
+                version_string.lstrip("grep (BSD grep, GNU compatible)").rstrip("-FreeBSD").strip()
+            )
+        # Don't know how to handle this version of grep, don't add it
+        else:
+            return None
 
     def configure_args(self):
         args = []