2 files changed, 15 insertions, 22 deletions
diff --git a/roles/yay/meta/main.yml b/roles/yay/meta/main.yml
index 99c8bbf..d708443 100644
--- a/roles/yay/meta/main.yml
+++ b/roles/yay/meta/main.yml
@@ -1,2 +1,3 @@
 dependencies:
-  - role: pacman
+  - role: common
+  - {role: pacman, when: has_pacman}
diff --git a/roles/yay/tasks/main.yml b/roles/yay/tasks/main.yml
index a8a1c70..bd8effb 100644
--- a/roles/yay/tasks/main.yml
+++ b/roles/yay/tasks/main.yml
@@ -1,23 +1,15 @@
-- name: Check if yay is installed
-  command: yay --version
-  register: yay_version
-  changed_when: false
-  failed_when: false
+- name: Upgrade packages
+  kewlfft.aur.aur:
+    use: yay
+    update_cache: true
+    upgrade: true
+    aur_only: true
+  register: yay_result
+  notify: reboot
 
-- when: yay_version.rc == 0
-  block:
-    - name: Upgrade packages
-      kewlfft.aur.aur:
-        use: yay
-        update_cache: true
-        upgrade: true
-        aur_only: true
-      register: yay_result
-      notify: reboot
+- debug:
+    var: yay_result
+  when: yay_result
 
-    - debug:
-        var: yay_result
-      when: yay_result
-
-    - name: Flush handlers
-      meta: flush_handlers
+- name: Flush handlers
+  meta: flush_handlers