# HG changeset patch # User Zeger Van de Vannet <747627+zegervdv@users.noreply.github.com> # Date 1674805868 -3600 # Node ID 1896bcf3fdb8700d9cefef6ce3f4ef8d9a7795ab # Parent 942c3ae067e750a259a89134ef7edbe93c7bc76d fix: handle templated scripts correctly on macOS (#10) * ci: reduce verboseness in test * fixup! ci: reduce verboseness in test * fixup! fixup! ci: reduce verboseness in test diff -r 942c3ae067e7 -r 1896bcf3fdb8 .chezmoiscripts/run_once_after_99-build-zsh-histdb-skim.sh.tmpl --- a/.chezmoiscripts/run_once_after_99-build-zsh-histdb-skim.sh.tmpl Mon Dec 12 20:19:43 2022 +0000 +++ b/.chezmoiscripts/run_once_after_99-build-zsh-histdb-skim.sh.tmpl Fri Jan 27 08:51:08 2023 +0100 @@ -1,4 +1,4 @@ -{{ if (and (or (eq .chezmoi.os "linux") (eq .chezmoi.os "darwin")) (ne .chezmoi.osRelease.id "centos")) -}} +{{ if (or (eq .chezmoi.os "darwin") (and (eq .chezmoi.os "linux") (ne .chezmoi.arch "arm64") (ne .chezmoi.osRelease.id "centos"))) -}} #!/usr/bin/env zsh source $HOME/.asdf/asdf.sh diff -r 942c3ae067e7 -r 1896bcf3fdb8 .chezmoiscripts/run_onchange_after_10-install-brew-packages.sh.tmpl --- a/.chezmoiscripts/run_onchange_after_10-install-brew-packages.sh.tmpl Mon Dec 12 20:19:43 2022 +0000 +++ b/.chezmoiscripts/run_onchange_after_10-install-brew-packages.sh.tmpl Fri Jan 27 08:51:08 2023 +0100 @@ -1,4 +1,4 @@ -{{ if (and (or (eq .chezmoi.os "linux") (eq .chezmoi.os "darwin")) (ne .chezmoi.arch "arm64") (ne .chezmoi.osRelease.id "centos")) -}} +{{ if (or (eq .chezmoi.os "darwin") (and (eq .chezmoi.os "linux") (ne .chezmoi.arch "arm64") (ne .chezmoi.osRelease.id "centos"))) -}} #!/usr/bin/env bash # Brewfile hash: {{ include "dot_Brewfile" | sha256sum }} diff -r 942c3ae067e7 -r 1896bcf3fdb8 .chezmoiscripts/run_onchange_after_20-install-asdf-plugins.sh.tmpl --- a/.chezmoiscripts/run_onchange_after_20-install-asdf-plugins.sh.tmpl Mon Dec 12 20:19:43 2022 +0000 +++ b/.chezmoiscripts/run_onchange_after_20-install-asdf-plugins.sh.tmpl Fri Jan 27 08:51:08 2023 +0100 @@ -1,4 +1,4 @@ -{{ if (and (or (eq .chezmoi.os "linux") (eq .chezmoi.os "darwin")) (ne .chezmoi.osRelease.id "centos")) -}} +{{ if (or (eq .chezmoi.os "darwin") (and (eq .chezmoi.os "linux") (ne .chezmoi.arch "arm64") (ne .chezmoi.osRelease.id "centos"))) -}} #!/usr/bin/env bash # asdf globals tools hash: {{ include "dot_tool-versions" | sha256sum }} diff -r 942c3ae067e7 -r 1896bcf3fdb8 .github/workflows/test.yml --- a/.github/workflows/test.yml Mon Dec 12 20:19:43 2022 +0000 +++ b/.github/workflows/test.yml Fri Jan 27 08:51:08 2023 +0100 @@ -36,4 +36,4 @@ run: chezmoi init -v zegervdv --branch ${GITHUB_REF##*/} - name: Apply dotfiles - run: chezmoi apply -v + run: chezmoi apply