fix darwin packages

tasks/addpkg.yml

@@ -1,23 +1,22 @@
 ---
-- name: check if task for "{{pkg}}" exists
+- name: "check if task for {{ansible_os_family}}/{{pkg}} exists"
   ansible.builtin.command: "test -f {{role_path}}/tasks/pkgs/{{ ansible_os_family }}/{{ pkg }}.yml"
   register: cpkg_exists
   ignore_errors: true
-  failed_when: cpkg_exists.rc == 127
+  failed_when: not (cpkg_exists.rc != 0 or cpkg_exists.rc != 1)
 
-- debug:
-    var: cpkg_exists
-
-- name: add include task for "{{pkg}}"
+- name: "add include task for {{ansible_os_family}}/{{pkg}}"
   ansible.builtin.include_tasks:
     file: "pkgs/{{ ansible_os_family }}/{{ pkg }}.yml"
   when: cpkg_exists.rc == 0
   tags:
     - packages
 
-- name: add "{{pkg}}" to syspkgs
+- name: "add {{pkg}} to syspkgs if task doesn't exist: {{assume_missing_is_syspkg}}"
   ansible.builtin.set_fact:
     syspkgs: "{{ syspkgs + [pkg] }}"
-  when: cpkg_exists.rc == 1
+  when:
+    - cpkg_exists.rc == 1
+    - assume_missing_is_syspkg
   tags:
     - packages

tasks/pkgs/Darwin/ansible.yml

@@ -1,7 +1,7 @@
 ---
-- name: append ansible to brewpkgs
+- name: append ansible to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'ansible' ]}}"
+    syspkgs: "{{ syspkgs + [ 'ansible' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/btop.yml

@@ -1,7 +1,7 @@
 ---
-- name: append btop to brewpkgs
+- name: append btop to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'btop' ]}}"
+    syspkgs: "{{ syspkgs + [ 'btop' ]}}"
   tags:
     - MacOS
     - brew

tasks/pkgs/Darwin/carapace.yml

@@ -1,7 +1,7 @@
 ---
-- name: append carapace to brewpkgs
+- name: append carapace to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'carapace' ] }}"
+    syspkgs: "{{ syspkgs + [ 'carapace' ] }}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/editorconfig.yml

@@ -1,7 +1,7 @@
 ---
-- name: append editorconfig to brewpkgs
+- name: append editorconfig to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'editorconfig' ]}}"
+    syspkgs: "{{ syspkgs + [ 'editorconfig' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/fzf.yml

@@ -1,7 +1,7 @@
 ---
-- name: append fzf to brewpkgs
+- name: append fzf to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'fzf' ]}}"
+    syspkgs: "{{ syspkgs + [ 'fzf' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/git.yml

@@ -11,9 +11,9 @@
     - homebrew
     - package
 
-- name: append git to brewpkgs
+- name: append git to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + git_pkgs }}"
+    syspkgs: "{{ syspkgs + git_pkgs }}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/go.yml

@@ -1,7 +1,10 @@
 ---
+- ansible.builtin.include_vars:
+    file: go.yml
+    name: _go
 - name: set go arch
   ansible.builtin.set_fact:
-    arch: "{% if ansible_archtecture == 'aarch64' %}arm64{% else %}amd64{% endif %}"
+    arch: "{{ _go.archmap[ansible_architecture] }}"
 
 - name: set go Filename
   ansible.builtin.set_fact:

tasks/pkgs/Darwin/hugo.yml

@@ -1,7 +1,7 @@
 ---
-- name: append hugo to brewpkgs
+- name: append hugo to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'hugo' ]}}"
+    syspkgs: "{{ syspkgs + [ 'hugo' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/jq.yml

@@ -1,7 +1,7 @@
 ---
-- name: append jq to brewpkgs
+- name: append jq to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'jq' ]}}"
+    syspkgs: "{{ syspkgs + [ 'jq' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/neovim.yml

@@ -1,7 +1,7 @@
 ---
-- name: append neovim to brewpkgs
+- name: append neovim to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'neovim' ]}}"
+    syspkgs: "{{ syspkgs + [ 'neovim' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/nodejs.yml

@@ -1,7 +1,7 @@
 ---
-- name: append node to brewpkgs
+- name: append node to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'node' ]}}"
+    syspkgs: "{{ syspkgs + [ 'node' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/nushell.yml

@@ -1,7 +1,7 @@
 ---
-- name: append nushell to brewpkgs
+- name: append nushell to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'nushell' ]}}"
+    syspkgs: "{{ syspkgs + [ 'nushell' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/pandoc.yml

@@ -1,7 +1,7 @@
 ---
-- name: append pandoc to brewpkgs
+- name: append pandoc to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'pandoc' ]}}"
+    syspkgs: "{{ syspkgs + [ 'pandoc' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/pipx.yml

@@ -1,7 +1,7 @@
 ---
-- name: append pipx to brewpkgs
+- name: append pipx to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'pipx' ]}}"
+    syspkgs: "{{ syspkgs + [ 'pipx' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/python3-pip.yml

@@ -1,7 +1,7 @@
 ---
-- name: append python3 to brewpkgs
+- name: append python3 to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'python3' ]}}"
+    syspkgs: "{{ syspkgs + [ 'python3' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/ripgrep.yml

@@ -1,7 +1,7 @@
 ---
-- name: append ripgrep to brewpkgs
+- name: append ripgrep to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'ripgrep' ]}}"
+    syspkgs: "{{ syspkgs + [ 'ripgrep' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/rust.yml

@@ -1,7 +1,7 @@
 ---
-- name: append rust to brewpkgs
+- name: append rust to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'rust' ]}}"
+    syspkgs: "{{ syspkgs + [ 'rust' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/stow.yml

@@ -1,7 +1,7 @@
 ---
-- name: append stow to brewpkgs
+- name: append stow to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'stow' ]}}"
+    syspkgs: "{{ syspkgs + [ 'stow' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/terraform.yml

@@ -1,4 +1,4 @@
 ---
-- name: append terraform to brewpkgs
+- name: append terraform to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'terraform' ]}}"
+    syspkgs: "{{ syspkgs + [ 'terraform' ]}}"

tasks/pkgs/Darwin/tidy.yml

@@ -1,7 +1,7 @@
 ---
-- name: append tidy-html5 to brewpkgs
+- name: append tidy-html5 to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'tidy-html5' ]}}"
+    syspkgs: "{{ syspkgs + [ 'tidy-html5' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/tmux.yml

@@ -1,7 +1,7 @@
 ---
-- name: append tmux to brewpkgs
+- name: append tmux to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'tmux' ]}}"
+    syspkgs: "{{ syspkgs + [ 'tmux' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/pkgs/Darwin/zoxide.yml

@@ -1,7 +1,7 @@
 ---
-- name: append zoxide to brewpkgs
+- name: append zoxide to syspkgs
   set_fact:
-    brewpkgs: "{{ brewpkgs + [ 'zoxide' ]}}"
+    syspkgs: "{{ syspkgs + [ 'zoxide' ]}}"
   tags:
     - MacOS
     - homebrew

vars/main.yml

@@ -4,6 +4,7 @@ packages: []
 syspkgs: []
 srcpkgs: []
 caskpkgs: []
+assume_missing_is_syspkg: false
 install_state: present
 full_upgrade: false
 _ghbase: "https://github.com"