Refactor: Join tasks into blocks to factor out conditions

[ansible.git] / playbooks / debian / roles / root / tasks / mc.yml

diff --git a/playbooks/debian/roles/root/tasks/mc.yml b/playbooks/debian/roles/root/tasks/mc.yml
index e46d622f7731aeab7a24fb220f2e5f2762f8846e..c27e80e99d076681ad6c51e1e000b178063a7a3b 100644 (file)
--- a/playbooks/debian/roles/root/tasks/mc.yml
+++ b/playbooks/debian/roles/root/tasks/mc.yml
@@ -1,51 +1,51 @@
 - name: "Setup root mc - check mc links"
   become: true
-  command: test -L ~root/.cache/mc -a -L ~root/.config/mc -a -L ~root/.local/share/mc
-  failed_when: false
+  stat:
+    path: "{{ item }}"
   register: links_exist
+  changed_when: not links_exist.stat.exists
+  loop: ['~root/.cache/mc', '~root/.config/mc', '~root/.local/share/mc']
 
 - debug:
     msg: "mc links have already been created"
-  when: links_exist.rc == 0
+  when: links_exist.results|selectattr('stat.exists')|selectattr('stat.islnk')|list|length == 3
 
-- name: "Setup root mc - create directories for mc links"
-  become: true
-  file:
-    path: "~root/{{ item }}"
-    state: directory
-    mode: "0700"
-  loop: ['.cache', '.config', '.local/share']
-  when: links_exist.rc != 0
+- block:
+    - name: "Setup root mc - create directories for mc links"
+      become: true
+      file:
+        path: "~root/{{ item }}"
+        state: directory
+        mode: "0700"
+      loop: ['.cache', '.config', '.local/share']
 
-- name: "Setup root mc - remove mc directories"
-  become: true
-  file:
-    path: "~root/{{ item }}"
-    state: absent
-  loop: ['.cache/mc', '.config/mc', '.local/share/mc']
-  when: links_exist.rc != 0
+    - name: "Setup root mc - remove mc directories"
+      become: true
+      file:
+        path: "~root/{{ item }}"
+        state: absent
+      loop: ['.cache/mc', '.config/mc', '.local/share/mc']
 
-- name: "Setup root mc - link mc directories (1)"
-  become: true
-  file:
-    path: "~root/{{ item }}"
-    state: link
-    src: "../.mc"
-    force: yes
-  loop: ['.cache/mc', '.config/mc']
-  when: links_exist.rc != 0
+    - name: "Setup root mc - link mc directories (1)"
+      become: true
+      file:
+        path: "~root/{{ item }}"
+        state: link
+        src: "../.mc"
+        force: yes
+      loop: ['.cache/mc', '.config/mc']
 
-- name: "Setup root mc - link mc directories (2)"
-  become: true
-  file:
-    path: "~root/{{ item }}"
-    state: link
-    src: "../../.mc"
-    force: yes
-  loop: ['.local/share/mc']
-  when: links_exist.rc != 0
+    - name: "Setup root mc - link mc directories (2)"
+      become: true
+      file:
+        path: "~root/{{ item }}"
+        state: link
+        src: "../../.mc"
+        force: yes
+      loop: ['.local/share/mc']
+  when: links_exist.results|selectattr('stat.exists')|selectattr('stat.islnk')|list|length != 3
 
-- name: "Setup root ms - overwrite files from ~phd/admin"
+- name: "Setup root mc - overwrite files from ~phd/admin"
   become: true
   copy:
     src: "~phd/admin/home/root/.mc/{{ item }}"
@@ -56,4 +56,3 @@
     mode: "0600"
     force: yes
   loop: ['hotlist', 'ini', 'panels.ini']
-