fzf: add v0.40.0 and refactor package (#37569)

* fzf: add v0.40.0 and refactor package
* Remove unused imports

1 files changed, 17 insertions, 24 deletions

diff --git a/var/spack/repos/builtin/packages/fzf/package.py b/var/spack/repos/builtin/packages/fzf/package.py
index fac4c22179..f975d86473 100644
--- a/var/spack/repos/builtin/packages/fzf/package.py
+++ b/var/spack/repos/builtin/packages/fzf/package.py
@@ -2,9 +2,7 @@
 # Spack Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
-import os
 import re
-import shutil
 
 from spack.package import *
 
@@ -15,38 +13,30 @@ class Fzf(MakefilePackage):
     homepage = "https://github.com/junegunn/fzf"
     url = "https://github.com/junegunn/fzf/archive/0.17.5.tar.gz"
 
+    maintainers("alecbcs")
+
     executables = ["^fzf$"]
 
-    version("0.22.0", sha256="3090748bb656333ed98490fe62133760e5da40ba4cd429a8142b4a0b69d05586")
-    version("0.17.5", sha256="de3b39758e01b19bbc04ee0d5107e14052d3a32ce8f40d4a63d0ed311394f7ee")
-    version("0.17.4", sha256="a4b009638266b116f422d159cd1e09df64112e6ae3490964db2cd46636981ff0")
-    version("0.17.3", sha256="e843904417adf926613431e4403fded24fade56269446e92aac6ff1db86af81e")
-    version("0.17.1", sha256="9c881e55780c0f56b5a30b87df756634d853bfd3938e7e53cb2df6ed63aa84a7")
-    version("0.17.0-2", sha256="a084415231b452b92a6b8aa87a69c0c02ee59bfe95774bf0d4fcc9a6251ece20")
-    version("0.17.0", sha256="23569faf64cd6831c09aad7030c8b4bace0eb7a979c580b33cc4e4f9ff303e29")
-    version("0.16.11", sha256="e3067d4ad58d7be51eba9a35c06518cd7145c0cc297882796c7e40285f268a99")
-    version("0.16.10", sha256="a6b9d8abcba4239d30201cc7911e9c305a5cd750081ce5cd389f8e7425f4dc93")
-    version("0.16.9", sha256="dd9434576c68313481613a5bd52dbf623eee37a5c87f7bb66ca71ac8add5ff94")
-    version("0.16.8", sha256="daef99f67cff3dad261dbcf2aef995bb78b360bcc7098d7230cb11674e1ee1d4")
+    version("0.40.0", sha256="9597f297a6811d300f619fff5aadab8003adbcc1566199a43886d2ea09109a65")
 
-    depends_on("go@1.11:", type="build")
+    depends_on("go@1.17:", type="build")
 
     variant("vim", default=False, description="Install vim plugins for fzf")
 
-    patch("github_mirrors.patch", when="@:0.17.5")
-
     @classmethod
     def determine_version(cls, exe):
-        candidate = Executable(exe)("--version", output=str, error=str)
-        match = re.match(r"(^[\d.]+)", candidate)
+        output = Executable(exe)("--version", output=str, error=str)
+        match = re.match(r"(^[\d.]+)", output)
         return match.group(1) if match else None
 
-    @when("@:0.17.5")
-    def patch(self):
-        glide_home = os.path.join(self.build_directory, "glide_home")
-        os.environ["GLIDE_HOME"] = glide_home
-        shutil.rmtree(glide_home, ignore_errors=True)
-        os.mkdir(glide_home)
+    def setup_build_environment(self, env):
+        # Point GOPATH at the top of the staging dir for the build step.
+        env.prepend_path("GOPATH", self.stage.path)
+
+        # Set required environment variables since we
+        # are not using git to pull down the repository.
+        env.set("FZF_VERSION", self.spec.version)
+        env.set("FZF_REVISION", "tarball")
 
     def install(self, spec, prefix):
         make("install")
@@ -54,6 +44,9 @@ class Fzf(MakefilePackage):
         mkdir(prefix.bin)
         install("bin/fzf", prefix.bin)
 
+        mkdirp(prefix.share.fzf.shell)
+        install_tree("shell", prefix.share.fzf.shell)
+
     @run_after("install")
     def post_install(self):
         if "+vim" in self.spec: