From c3342f81948058cded2d8a3d0cf6dd23a23f1a6f Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Wed, 4 Jan 2023 06:48:12 +0000 Subject: [PATCH] Update 17 files - /home/private_dot_config/git/template/symlink_commit-msg - /home/private_dot_config/git/template/symlink_post-checkout - /home/private_dot_config/git/template/symlink_post-commit - /home/private_dot_config/git/template/symlink_post-merge - /home/private_dot_config/git/template/symlink_post-rewrite - /home/private_dot_config/git/template/symlink_pre-commit - /home/private_dot_config/git/template/symlink_pre-push - /home/private_dot_config/git/template/symlink_prepare-commit-msg - /home/private_dot_config/git/template/symlink_commit-msg.tmpl - /home/private_dot_config/git/template/symlink_post-checkout.tmpl - /home/private_dot_config/git/template/symlink_post-commit.tmpl - /home/private_dot_config/git/template/symlink_post-merge.tmpl - /home/private_dot_config/git/template/symlink_post-rewrite.tmpl - /home/private_dot_config/git/template/symlink_pre-commit.tmpl - /home/private_dot_config/git/template/symlink_pre-push.tmpl - /home/private_dot_config/git/template/symlink_prepare-commit-msg.tmpl - /home/.chezmoiscripts/universal/run_onchange_after_11-symlink-ansible-roles.tmpl --- .../run_onchange_after_11-symlink-ansible-roles.tmpl | 6 ++++-- home/private_dot_config/git/template/symlink_commit-msg | 1 - .../private_dot_config/git/template/symlink_commit-msg.tmpl | 3 +++ home/private_dot_config/git/template/symlink_post-checkout | 1 - .../git/template/symlink_post-checkout.tmpl | 3 +++ home/private_dot_config/git/template/symlink_post-commit | 1 - .../git/template/symlink_post-commit.tmpl | 3 +++ home/private_dot_config/git/template/symlink_post-merge | 1 - .../private_dot_config/git/template/symlink_post-merge.tmpl | 3 +++ home/private_dot_config/git/template/symlink_post-rewrite | 1 - .../git/template/symlink_post-rewrite.tmpl | 3 +++ home/private_dot_config/git/template/symlink_pre-commit | 1 - .../private_dot_config/git/template/symlink_pre-commit.tmpl | 3 +++ home/private_dot_config/git/template/symlink_pre-push | 1 - home/private_dot_config/git/template/symlink_pre-push.tmpl | 3 +++ .../git/template/symlink_prepare-commit-msg | 1 - .../git/template/symlink_prepare-commit-msg.tmpl | 3 +++ 17 files changed, 28 insertions(+), 10 deletions(-) delete mode 100644 home/private_dot_config/git/template/symlink_commit-msg create mode 100644 home/private_dot_config/git/template/symlink_commit-msg.tmpl delete mode 100644 home/private_dot_config/git/template/symlink_post-checkout create mode 100644 home/private_dot_config/git/template/symlink_post-checkout.tmpl delete mode 100644 home/private_dot_config/git/template/symlink_post-commit create mode 100644 home/private_dot_config/git/template/symlink_post-commit.tmpl delete mode 100644 home/private_dot_config/git/template/symlink_post-merge create mode 100644 home/private_dot_config/git/template/symlink_post-merge.tmpl delete mode 100644 home/private_dot_config/git/template/symlink_post-rewrite create mode 100644 home/private_dot_config/git/template/symlink_post-rewrite.tmpl delete mode 100644 home/private_dot_config/git/template/symlink_pre-commit create mode 100644 home/private_dot_config/git/template/symlink_pre-commit.tmpl delete mode 100644 home/private_dot_config/git/template/symlink_pre-push create mode 100644 home/private_dot_config/git/template/symlink_pre-push.tmpl delete mode 100644 home/private_dot_config/git/template/symlink_prepare-commit-msg create mode 100644 home/private_dot_config/git/template/symlink_prepare-commit-msg.tmpl diff --git a/home/.chezmoiscripts/universal/run_onchange_after_11-symlink-ansible-roles.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_11-symlink-ansible-roles.tmpl index 55ca4b9f..fd7ff664 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_11-symlink-ansible-roles.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_11-symlink-ansible-roles.tmpl @@ -25,5 +25,7 @@ find "$HOME/.local/src/gas-station/roles" -mindepth 2 -maxdepth 2 -type d | whil fi done -logg info 'Ensuring Ansible Galaxy collections are installed' -ansible-galaxy install -r "$HOME/.local/src/gas-station/requirements.yml" \ No newline at end of file +if [ -f "$HOME/.local/src/gas-station/requirements.yml" ] && command -v ansible-galaxy > /dev/null; then + logg info 'Ensuring Ansible Galaxy collections are installed' + ansible-galaxy install -r "$HOME/.local/src/gas-station/requirements.yml" +fi diff --git a/home/private_dot_config/git/template/symlink_commit-msg b/home/private_dot_config/git/template/symlink_commit-msg deleted file mode 100644 index a1e7d218..00000000 --- a/home/private_dot_config/git/template/symlink_commit-msg +++ /dev/null @@ -1 +0,0 @@ -~/.local/src/shared-common/common/.config/husky/commit-msg \ No newline at end of file diff --git a/home/private_dot_config/git/template/symlink_commit-msg.tmpl b/home/private_dot_config/git/template/symlink_commit-msg.tmpl new file mode 100644 index 00000000..b63e98d7 --- /dev/null +++ b/home/private_dot_config/git/template/symlink_commit-msg.tmpl @@ -0,0 +1,3 @@ +{{- if true -}} +{{ .host.home }}/.local/src/shared-common/common/.config/husky/commit-msg +{{- end -}} diff --git a/home/private_dot_config/git/template/symlink_post-checkout b/home/private_dot_config/git/template/symlink_post-checkout deleted file mode 100644 index ccd0805a..00000000 --- a/home/private_dot_config/git/template/symlink_post-checkout +++ /dev/null @@ -1 +0,0 @@ -~/.local/src/shared-common/common/.config/husky/post-checkout \ No newline at end of file diff --git a/home/private_dot_config/git/template/symlink_post-checkout.tmpl b/home/private_dot_config/git/template/symlink_post-checkout.tmpl new file mode 100644 index 00000000..0a0ccf59 --- /dev/null +++ b/home/private_dot_config/git/template/symlink_post-checkout.tmpl @@ -0,0 +1,3 @@ +{{- if true -}} +{{ .host.home }}/.local/src/shared-common/common/.config/husky/post-checkout +{{- end -}} diff --git a/home/private_dot_config/git/template/symlink_post-commit b/home/private_dot_config/git/template/symlink_post-commit deleted file mode 100644 index 6a782fc4..00000000 --- a/home/private_dot_config/git/template/symlink_post-commit +++ /dev/null @@ -1 +0,0 @@ -~/.local/src/shared-common/common/.config/husky/post-commit \ No newline at end of file diff --git a/home/private_dot_config/git/template/symlink_post-commit.tmpl b/home/private_dot_config/git/template/symlink_post-commit.tmpl new file mode 100644 index 00000000..33f2836f --- /dev/null +++ b/home/private_dot_config/git/template/symlink_post-commit.tmpl @@ -0,0 +1,3 @@ +{{- if true -}} +{{ .host.home }}/.local/src/shared-common/common/.config/husky/post-commit +{{- end -}} diff --git a/home/private_dot_config/git/template/symlink_post-merge b/home/private_dot_config/git/template/symlink_post-merge deleted file mode 100644 index fd85c7b3..00000000 --- a/home/private_dot_config/git/template/symlink_post-merge +++ /dev/null @@ -1 +0,0 @@ -~/.local/src/shared-common/common/.config/husky/post-merge \ No newline at end of file diff --git a/home/private_dot_config/git/template/symlink_post-merge.tmpl b/home/private_dot_config/git/template/symlink_post-merge.tmpl new file mode 100644 index 00000000..d1640e10 --- /dev/null +++ b/home/private_dot_config/git/template/symlink_post-merge.tmpl @@ -0,0 +1,3 @@ +{{- if true -}} +{{ .host.home }}/.local/src/shared-common/common/.config/husky/post-merge +{{- end -}} diff --git a/home/private_dot_config/git/template/symlink_post-rewrite b/home/private_dot_config/git/template/symlink_post-rewrite deleted file mode 100644 index 00482659..00000000 --- a/home/private_dot_config/git/template/symlink_post-rewrite +++ /dev/null @@ -1 +0,0 @@ -~/.local/src/shared-common/common/.config/husky/post-rewrite \ No newline at end of file diff --git a/home/private_dot_config/git/template/symlink_post-rewrite.tmpl b/home/private_dot_config/git/template/symlink_post-rewrite.tmpl new file mode 100644 index 00000000..1f6308f8 --- /dev/null +++ b/home/private_dot_config/git/template/symlink_post-rewrite.tmpl @@ -0,0 +1,3 @@ +{{- if true -}} +{{ .host.home }}/.local/src/shared-common/common/.config/husky/post-rewrite +{{- end -}} diff --git a/home/private_dot_config/git/template/symlink_pre-commit b/home/private_dot_config/git/template/symlink_pre-commit deleted file mode 100644 index b12252d4..00000000 --- a/home/private_dot_config/git/template/symlink_pre-commit +++ /dev/null @@ -1 +0,0 @@ -~/.local/src/shared-common/common/.config/husky/pre-commit \ No newline at end of file diff --git a/home/private_dot_config/git/template/symlink_pre-commit.tmpl b/home/private_dot_config/git/template/symlink_pre-commit.tmpl new file mode 100644 index 00000000..20d6eab9 --- /dev/null +++ b/home/private_dot_config/git/template/symlink_pre-commit.tmpl @@ -0,0 +1,3 @@ +{{- if true -}} +{{ .host.home }}/.local/src/shared-common/common/.config/husky/pre-commit +{{- end -}} diff --git a/home/private_dot_config/git/template/symlink_pre-push b/home/private_dot_config/git/template/symlink_pre-push deleted file mode 100644 index 2ea4b0c0..00000000 --- a/home/private_dot_config/git/template/symlink_pre-push +++ /dev/null @@ -1 +0,0 @@ -~/.local/src/shared-common/common/.config/husky/pre-push \ No newline at end of file diff --git a/home/private_dot_config/git/template/symlink_pre-push.tmpl b/home/private_dot_config/git/template/symlink_pre-push.tmpl new file mode 100644 index 00000000..2edb565e --- /dev/null +++ b/home/private_dot_config/git/template/symlink_pre-push.tmpl @@ -0,0 +1,3 @@ +{{- if true -}} +{{ .host.home }}/.local/src/shared-common/common/.config/husky/pre-push +{{- end -}} diff --git a/home/private_dot_config/git/template/symlink_prepare-commit-msg b/home/private_dot_config/git/template/symlink_prepare-commit-msg deleted file mode 100644 index 73ca9a12..00000000 --- a/home/private_dot_config/git/template/symlink_prepare-commit-msg +++ /dev/null @@ -1 +0,0 @@ -~/.local/src/shared-common/common/.config/husky/prepare-commit-msg \ No newline at end of file diff --git a/home/private_dot_config/git/template/symlink_prepare-commit-msg.tmpl b/home/private_dot_config/git/template/symlink_prepare-commit-msg.tmpl new file mode 100644 index 00000000..1acc9b92 --- /dev/null +++ b/home/private_dot_config/git/template/symlink_prepare-commit-msg.tmpl @@ -0,0 +1,3 @@ +{{- if true -}} +{{ .host.home }}/.local/src/shared-common/common/.config/husky/prepare-commit-msg +{{- end -}}