From 0cc673629e450d65e8be26ed7b074745652f2d6c Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Thu, 24 Nov 2022 18:52:43 +0000 Subject: [PATCH] Update 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_60-cleanup.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-dependencies.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies.tmpl, 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/.chezmoitemplates/universal/logg --- ...run_onchange_before_10_install-archlinux-dependencies.tmpl | 4 ++-- .../run_onchange_before_10-install-centos-dependencies.tmpl | 4 ++-- .../run_onchange_before_10_install-darwin-dependencies.tmpl | 4 ++-- .../run_onchange_before_10-install-debian-dependencies.tmpl | 4 ++-- .../run_onchange_before_10-install-fedora-dependencies.tmpl | 4 ++-- .../run_onchange_before_11-install-freebsd-packages.tmpl | 4 ++-- .../run_onchange_before_11-install-opensuse-software.tmpl | 4 ++-- .../run_onchange_before_10_install-ubuntu-dependencies.tmpl | 4 ++-- .../run_onchange_after_15_install-asdf-packages.tmpl | 2 +- .../universal/run_onchange_after_60-cleanup.tmpl | 2 +- .../home/.chezmoitemplates/universal/{logg.sh => logg} | 0 11 files changed, 18 insertions(+), 18 deletions(-) rename dotfiles/.local/share/chezmoi/home/.chezmoitemplates/universal/{logg.sh => logg} (100%) 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 52446a5e..b80b4aca 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 @@ -15,8 +15,8 @@ {{- $packages = concat $packages $pyenvDependencies -}} {{- end }} -logg 'Installing common dependencies using pacman' -logg "Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}" +logg 'Installing common dependencies using `pacman`' +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 e3c137eb..76b263ce 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 @@ -6,8 +6,8 @@ {{- $packages := splitList " " (includeTemplate "universal/essential-packages" .) }} # TODO - Add Python dependencies like in ubuntu/archlinux -logg 'Installing common dependencies using dnf' -logg "Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}" +logg 'Installing common dependencies using `dnf`' +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 252822ca..c1cee097 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 @@ -19,8 +19,8 @@ eval $(/usr/local/bin/brew shellenv) {{- end }} logg 'Installing base dependencies for macOS using `brew bundle`' -logg 'Dependencies: asdf jq node go-task/tap/go-task volta yq m-cli zx' -logg 'Additional dependencies for GNU compatibility: 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 gsed -i 's/\.\/\.config\/taskfiles/taskfiles/g' ~/.local/Taskfile.yml else - logg 'Unable to fix `~/.local/Taskfile.yml` because gsed GNU compatibility tool is not installed.' + logg warn 'Unable to fix `~/.local/Taskfile.yml` because gsed GNU compatibility tool is not installed.' fi {{- end }} diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoitemplates/universal/logg.sh b/dotfiles/.local/share/chezmoi/home/.chezmoitemplates/universal/logg similarity index 100% rename from dotfiles/.local/share/chezmoi/home/.chezmoitemplates/universal/logg.sh rename to dotfiles/.local/share/chezmoi/home/.chezmoitemplates/universal/logg