From cef15eddce2dad561e8979efb9b200b71112ac74 Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo@ivuorinen.net>
Date: Tue, 9 Jul 2024 03:20:50 +0300
Subject: [PATCH] chore(asdf): update tools, fix installer

---
 config/asdf/tool-versions | 21 +++++++++---
 scripts/install-asdf.sh   | 72 +++++++++++++++++++--------------------
 2 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/config/asdf/tool-versions b/config/asdf/tool-versions
index 2985c65..5dfd937 100644
--- a/config/asdf/tool-versions
+++ b/config/asdf/tool-versions
@@ -1,16 +1,27 @@
 1password-cli 2.29.0
 age 1.2.0
+asdf-plugin-manager 1.3.1
 bottom 0.9.6
-eza 0.18.19
+dotenv-linter 3.3.0
+editorconfig-checker 2.8.0
+eza 0.18.21
 fd 10.1.0
+github-cli 2.52.0
 hadolint 2.12.0
 kubectl 1.30.2
 lazygit 0.42.0
-nodejs 22.3.0
+neovim system
+nodejs 22.4.0
 pipx 1.6.0
+pre-commit 3.7.1
+ripgrep 14.1.0
+semgrep system
+shellcheck 0.10.0
+shfmt 3.8.0
+terraform-ls system
+terraform-lsp 0.0.12
+terragrunt 0.60.1
 tf-summarize 0.3.10
-vault 1.17.0+ent
+vault 1.17.1
 yamllint 1.35.1
 yq 4.44.2
-neovim system
-asdf-plugin-manager 1.3.1
diff --git a/scripts/install-asdf.sh b/scripts/install-asdf.sh
index 435eede..5226112 100755
--- a/scripts/install-asdf.sh
+++ b/scripts/install-asdf.sh
@@ -34,42 +34,42 @@ asdf-plugin-manager add-all
 
 asdf install
 
-# ASDF_INSTALLABLES=(
-#     "nodejs:github.com/asdf-vm/asdf-nodejs.git"
-#     "1password-cli:github.com/NeoHsu/asdf-1password-cli.git"
-#     "age:github.com/threkk/asdf-age.git"
-#     "bottom:github.com/carbonteq/asdf-btm.git"
-#     "dotenv-linter:github.com/wesleimp/asdf-dotenv-linter.git"
-#     "editorconfig-checker:github.com/gabitchov/asdf-editorconfig-checker.git"
-#     "eza:github.com/lwiechec/asdf-eza.git"
-#     "fd:gitlab.com/wt0f/asdf-fd.git"
-#     "github-cli:github.com/bartlomiejdanek/asdf-github-cli.git"
-#     "hadolint:github.com/devlincashman/asdf-hadolint.git"
-#     "kubectl:github.com/asdf-community/asdf-kubectl.git"
-#     "lazygit:github.com/nklmilojevic/asdf-lazygit.git"
-#     "pipx:github.com/yozachar/asdf-pipx.git"
-#     "pre-commit:github.com/jonathanmorley/asdf-pre-commit.git"
-#     "ripgrep:gitlab.com/wt0f/asdf-ripgrep.git"
-#     "semgrep:github.com/brentjanderson/asdf-semgrep.git"
-#     "terraform-ls:github.com/asdf-community/asdf-hashicorp.git"
-#     "vault:github.com/asdf-community/asdf-hashicorp.git"
-#     "shellcheck:github.com/luizm/asdf-shellcheck.git"
-#     "shfmt:github.com/luizm/asdf-shfmt.git"
-#     "terraform-lsp:github.com/bartlomiejdanek/asdf-terraform-lsp.git"
-#     "terragrunt:github.com/ohmer/asdf-terragrunt.git"
-#     "tf-summarize:github.com/adamcrews/asdf-tf-summarize.git"
-#     "yamllint:github.com/ericcornelissen/asdf-yamllint.git"
-#     "yq:github.com/sudermanjr/asdf-yq.git"
-# )
-#
-# msg "Installing asdf plugins, if not already installed"
-# for item in "${ASDF_INSTALLABLES[@]}"; do
-#   CMD=$(echo "${item}" | awk -F ":" '{print $1}')
-#   URL=$(echo "${item}" | awk -F ":" '{print $2}')
-#   asdf plugin add "${CMD}" "https://${URL}"
-#   asdf install "${CMD}" latest
-#   asdf global "${CMD}" "$(asdf latest "${CMD}")"
-# done
+ASDF_INSTALLABLES=(
+  "nodejs:github.com/asdf-vm/asdf-nodejs.git"
+  "1password-cli:github.com/NeoHsu/asdf-1password-cli.git"
+  "age:github.com/threkk/asdf-age.git"
+  "bottom:github.com/carbonteq/asdf-btm.git"
+  "dotenv-linter:github.com/wesleimp/asdf-dotenv-linter.git"
+  "editorconfig-checker:github.com/gabitchov/asdf-editorconfig-checker.git"
+  "eza:github.com/lwiechec/asdf-eza.git"
+  "fd:gitlab.com/wt0f/asdf-fd.git"
+  "github-cli:github.com/bartlomiejdanek/asdf-github-cli.git"
+  "hadolint:github.com/devlincashman/asdf-hadolint.git"
+  "kubectl:github.com/asdf-community/asdf-kubectl.git"
+  "lazygit:github.com/nklmilojevic/asdf-lazygit.git"
+  "pipx:github.com/yozachar/asdf-pipx.git"
+  "pre-commit:github.com/jonathanmorley/asdf-pre-commit.git"
+  "ripgrep:gitlab.com/wt0f/asdf-ripgrep.git"
+  "semgrep:github.com/brentjanderson/asdf-semgrep.git"
+  "terraform-ls:github.com/asdf-community/asdf-hashicorp.git"
+  "vault:github.com/asdf-community/asdf-hashicorp.git"
+  "shellcheck:github.com/luizm/asdf-shellcheck.git"
+  "shfmt:github.com/luizm/asdf-shfmt.git"
+  "terraform-lsp:github.com/bartlomiejdanek/asdf-terraform-lsp.git"
+  "terragrunt:github.com/ohmer/asdf-terragrunt.git"
+  "tf-summarize:github.com/adamcrews/asdf-tf-summarize.git"
+  "yamllint:github.com/ericcornelissen/asdf-yamllint.git"
+  "yq:github.com/sudermanjr/asdf-yq.git"
+)
+
+msg "Installing asdf plugins, if not already installed"
+for item in "${ASDF_INSTALLABLES[@]}"; do
+  CMD=$(echo "${item}" | awk -F ":" '{print $1}')
+  URL=$(echo "${item}" | awk -F ":" '{print $2}')
+  asdf plugin add "${CMD}" "https://${URL}"
+  asdf install "${CMD}" latest
+  asdf global "${CMD}" "$(asdf latest "${CMD}")"
+done
 
 msg "Reshim asdf"
 asdf reshim