fix(chezmoi): install minimum packages only for Linux and add go-task…

… to prerequisites for macOS installation.
entelecheia · May 8, 2023 · 63c5a9b · 63c5a9b
1 parent 11a2e85
commit 63c5a9b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/chezmoi/.chezmoiscripts/run_once_after_21-install-minimum.tmpl b/chezmoi/.chezmoiscripts/run_once_after_21-install-minimum.tmpl
@@ -1,17 +1,15 @@
 #!/bin/bash
-# {{ if eq .chezmoi.os "linux" "darwin" }}
+# {{ if eq .chezmoi.os "linux" }}
 # {{ template "scripts-library" }}
-log_task "21. Installing minimum packages"
+log_task "21. Installing minimum packages for Linux"
+
+ensure_path_entry "${HOME}/.local/bin"
 
-# {{ if eq .chezmoi.os "linux" }}
 # install yq
 if ! yq --version &>/dev/null; then
   log_task "Installing yq"
   c wget /~https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O "${HOME}/.local/bin/yq" && chmod +x "${HOME}/.local/bin/yq"
 fi
-# {{ end }}
-
-ensure_path_entry "${HOME}/.local/bin"
 
 # install go
 if ! go version &>/dev/null; then

diff --git a/chezmoi/.chezmoiscripts/run_once_before_20-install-prerequisites-darwin.sh.tmpl b/chezmoi/.chezmoiscripts/run_once_before_20-install-prerequisites-darwin.sh.tmpl
@@ -44,6 +44,7 @@ readonly wanted_packages=(
   node
   age
   go
+  go-task
   sops
   stow
   pass
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,6 +44,7 @@ readonly wanted_packages=( @@
       node
       age
       go
+      go-task
       sops
       stow
       pass
@@ Expand Down @@