changeset 754:1896bcf3fdb8

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
author Zeger Van de Vannet <747627+zegervdv@users.noreply.github.com>
date Fri, 27 Jan 2023 08:51:08 +0100
parents 942c3ae067e7
children a979bc9d5931
files .chezmoiscripts/run_once_after_99-build-zsh-histdb-skim.sh.tmpl .chezmoiscripts/run_onchange_after_10-install-brew-packages.sh.tmpl .chezmoiscripts/run_onchange_after_20-install-asdf-plugins.sh.tmpl .github/workflows/test.yml
diffstat 4 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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 }}
--- 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 }}
--- 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