From e31522cb857832e58976ec3bd90e345d64c35da4 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Thu, 24 Nov 2022 20:38:23 +0000 Subject: [PATCH] Update dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-dependencies.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_11-install-darwin-packages.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_11-install-debian-packages.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_11-install-fedora-packages.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_10-install-freebsd-dependencies.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-packages.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_11-install-packages.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_15_install-asdf-packages.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_50-crontab.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-z4h.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps --- ...n_onchange_before_10_install-archlinux-dependencies.tmpl | 2 +- .../run_onchange_before_10-install-centos-dependencies.tmpl | 2 +- .../run_onchange_before_10_install-darwin-dependencies.tmpl | 6 ++---- .../run_onchange_before_11-install-darwin-packages.tmpl | 2 -- .../run_onchange_before_10-install-debian-dependencies.tmpl | 4 +--- .../run_onchange_before_11-install-debian-packages.tmpl | 3 +-- .../run_onchange_before_10-install-fedora-dependencies.tmpl | 4 +--- .../run_onchange_before_11-install-fedora-packages.tmpl | 3 +-- ...run_onchange_before_10-install-freebsd-dependencies.tmpl | 3 +-- .../run_onchange_before_11-install-freebsd-packages.tmpl | 5 +---- .../run_onchange_before_11-install-opensuse-packages.tmpl | 3 +-- .../run_onchange_before_11-install-opensuse-software.tmpl | 5 +---- .../run_onchange_before_10_install-ubuntu-dependencies.tmpl | 4 +--- .../ubuntu/run_onchange_before_11-install-packages.tmpl | 3 +-- .../run_onchange_after_15_install-asdf-packages.tmpl | 2 -- .../universal/run_onchange_after_50-crontab.tmpl | 6 ++++-- .../universal/run_onchange_after_80-bash-completions.tmpl | 2 -- .../universal/run_onchange_after_99_bootstrap-z4h.tmpl | 1 + ...logging-deps.tmpl => run_onchange_before_1-logging-deps} | 2 -- 19 files changed, 19 insertions(+), 43 deletions(-) rename dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/{run_onchange_before_1-logging-deps.tmpl => run_onchange_before_1-logging-deps} (97%) diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl index b80b4aca..25f46560 100644 --- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl +++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl @@ -16,7 +16,7 @@ {{- end }} logg 'Installing common dependencies using `pacman`' -logg info 'Dependencies: `{{ $packages | sortAlpha | uniq | join "` `" -}}`' +logg info 'Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}' ### Install base dependencies sudo pacman -Sy --noconfirm --needed {{ $packages | sortAlpha | uniq | join " " -}} diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl index 76b263ce..f0a5aad3 100644 --- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl +++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl @@ -7,7 +7,7 @@ # TODO - Add Python dependencies like in ubuntu/archlinux logg 'Installing common dependencies using `dnf`' -logg info 'Dependencies: `{{ $packages | sortAlpha | uniq | join "` `" -}}`' +logg info 'Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}' ### Install base dependencies sudo dnf install -y {{ $packages | sortAlpha | uniq | join " " -}} diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl index 910d5824..8a9416f8 100644 --- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl +++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl @@ -1,5 +1,4 @@ #!/usr/bin/env bash -{{- if eq .host.distro.id "darwin" }} # Required for styled logging {{- includeTemplate "universal/logg" }} @@ -21,10 +20,9 @@ eval $(/usr/local/bin/brew shellenv) {{- end }} logg 'Installing base dependencies for macOS using `brew bundle`' -logg info 'Dependencies: `asdf` `jq` `node` `go-task/tap/go-task` `volta` `yq` `m-cli` `zx`' -logg info 'GNU compatibility dependencies: `coreutils` `findutils` `gawk` `gnu-getopt` `gnu-indent` `gnu-tar` `gnu-sed` `gnutls` `grep`' +logg info 'Dependencies: asdf jq node `go-task/tap/go-task volta yq m-cli zx' +logg info 'GNU compatibility dependencies: coreutils findutils gawk gnu-getopt gnu-indent gnu-tar gnu-sed gnutls grep' brew bundle --verbose --no-lock --file=/dev/stdin </dev/null; then elif [ -f "$COMPLETION_DIR/zoxide.bash" ]; then rm "$COMPLETION_DIR/zoxide.bash" fi -{{- end }} diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-z4h.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-z4h.tmpl index 02a91acf..a5970dbd 100644 --- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-z4h.tmpl +++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-z4h.tmpl @@ -8,3 +8,4 @@ logg 'Bootstrapping Z4H' Z4H_BOOTSTRAPPING=1 exec zsh && exit 0 {{- end }} +# TODO diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps similarity index 97% rename from dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps.tmpl rename to dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps index 640e8e23..f909d193 100644 --- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps.tmpl +++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps @@ -1,5 +1,4 @@ #!/usr/bin/env bash -{{- if or (eq .host.distro.id "darwin") (eq .host.distro.family "linux") }} # @description Installs glow (a markdown renderer) from GitHub releases # @example installGlow @@ -69,4 +68,3 @@ echo "Ensuring Gum and Glow are installed (for logging)" installGlow & installGum & wait -{{- end }}