From 29d9cafdd23b7a3d6ad91f6192cf614ccdcc919a Mon Sep 17 00:00:00 2001
From: Matthew Stobbs <matthew@stobbs.ca>
Date: Thu, 23 Jan 2025 00:34:01 -0700
Subject: [PATCH] fix addpkg paths

---
 tasks/addpkg.yml | 10 +++++-----
 vars/main.yml    | 22 ++++++++++++----------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/tasks/addpkg.yml b/tasks/addpkg.yml
index 2680425..cf11275 100644
--- a/tasks/addpkg.yml
+++ b/tasks/addpkg.yml
@@ -1,13 +1,13 @@
 ---
-- name: "check if task for {{ansible_os_family}}/{{pkg}} exists"
-  ansible.builtin.command: "test -f {{role_path}}/tasks/pkgs/{{ ansible_os_family }}/{{ pkg }}.yml"
+- name: "check if task for {{pkg}} exists"
+  ansible.builtin.command: "test -f {{role_path}}/tasks/pkgs/{{ pkg }}.yml"
   register: cpkg_exists
   ignore_errors: true
   failed_when: not (cpkg_exists.rc != 0 or cpkg_exists.rc != 1)
 
-- name: "add include task for {{ansible_os_family}}/{{pkg}}"
+- name: "add include task for {{pkg}}"
   ansible.builtin.include_tasks:
-    file: "pkgs/{{ ansible_os_family }}/{{ pkg }}.yml"
+    file: "pkgs/{{ pkg }}.yml"
   when: cpkg_exists.rc == 0
   tags:
     - packages
@@ -16,7 +16,7 @@
   ansible.builtin.set_fact:
     syspkgs: "{{ syspkgs + [pkg] }}"
   when:
-    - cpkg_exists.rc == 1
+    - cpkg_exists.rc != 0
     - assume_missing_is_syspkg
   tags:
     - packages
diff --git a/vars/main.yml b/vars/main.yml
index 5c427b9..6834a21 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,14 +1,16 @@
 # variables used in ansible_role_package
 ---
-packages: []
-syspkgs: []
-srcpkgs: []
-caskpkgs: []
-cargopkgs: []
-npmpkgs: []
-gopkgs: []
-pipxpkgs: []
 assume_missing_is_syspkg: false
-install_state: present
 full_upgrade: false
-_ghbase: "https://github.com"
+install_state: present
+
+# install lists
+brewtaps: []
+cargopkgs: []
+caskpkgs: []
+gopkgs: []
+npmpkgs: []
+packages: []
+pipxpkgs: []
+srcpkgs: []
+syspkgs: []