From 50e48988072dc65e4951ceb97f172a671dde7fe2 Mon Sep 17 00:00:00 2001
From: Sebastian Estrella <2049686+sestrella@users.noreply.github.com>
Date: Sun, 3 Dec 2023 15:49:07 -0500
Subject: [PATCH] ci: Run shfmt and shellcheck

---
 .github/workflows/build.yml | 12 ++++++++++++
 devenv.nix                  |  7 ++++---
 lib/utils.bash              |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 21eaf18..d0642f7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,6 +8,17 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v24
+      - uses: cachix/cachix-action@v12
+        with:
+          name: devenv
+      - run: nix-env -iA cachix -f https://cachix.org/api/v1/install
+      - run: devenv ci
+
   test:
     strategy:
       matrix:
@@ -25,6 +36,7 @@ jobs:
           - plugin: stack
       fail-fast: true
     runs-on: ${{ matrix.os }}
+    needs: [check]
     steps:
       - uses: asdf-vm/actions/plugin-test@v3
         with:
diff --git a/devenv.nix b/devenv.nix
index 988ab94..6b39607 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -1,9 +1,10 @@
 { pkgs, ... }:
 
 {
-  packages = [ pkgs.shfmt ];
-
   languages.javascript.enable = true;
 
-  pre-commit.hooks.shellcheck.enable = true;
+  pre-commit.hooks = {
+    shellcheck.enable = true;
+    shfmt.enable = true;
+  };
 }
diff --git a/lib/utils.bash b/lib/utils.bash
index dfd132e..056ab31 100644
--- a/lib/utils.bash
+++ b/lib/utils.bash
@@ -34,7 +34,7 @@ install_version() {
 
 	ensure_ghcup
 
-	if [[ "$tool" == "ghc" ]] || { [[ "$tool" == "hls" ]] && [[ $(ver "$version") -ge $(ver "1.7") ]]; }; then
+	if [[ $tool == "ghc" ]] || { [[ $tool == "hls" ]] && [[ $(ver "$version") -ge $(ver "1.7") ]]; }; then
 		"$(ghcup_bin_dir)/ghcup" install "$tool" "$version" -i "$path"
 	else
 		"$(ghcup_bin_dir)/ghcup" install "$tool" "$version" -i "${path}/bin"