From 8e9f6a9582d569623afbfbcabc2e20e152bc3bfc Mon Sep 17 00:00:00 2001 From: Salt Date: Wed, 24 Jun 2020 10:29:58 -0500 Subject: [PATCH] Hopefully fix erroneous MultiMC pack detection --- roles/minecraft/tasks/main.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/roles/minecraft/tasks/main.yml b/roles/minecraft/tasks/main.yml index ed6dd53..351c29c 100644 --- a/roles/minecraft/tasks/main.yml +++ b/roles/minecraft/tasks/main.yml @@ -70,19 +70,21 @@ remote_src: yes dest: "/var/minecraft/{{ mcname }}" notify: "restart minecraft {{ mcname }}" - - name: Check for MultiMC pack - stat: - path: "/var/minecraft/{{ mcname }}/.minecraft" - register: stat_mcroot_multimc + - name: Look for MultiMC pack + find: + path: "/var/minecraft/{{ mcname }}" + patterns: '.minecraft' + ignore_errors: yes + register: find_multimc - name: Move .minecraft contents to root command: chdir: "/var/minecraft/{{ mcname }}" argv: - mv - - "/var/minecraft/{{ mcname }}/.minecraft/*" + - "/var/minecraft/{{ mcname }}/*/.minecraft/*" - "." notify: "restart minecraft {{ mcname }}" - when: stat_mcroot_multimc.stat.exists + when: not find_multimc is failed - name: Remove MultiMC artifacts file: path: "{{ item }}" @@ -91,7 +93,7 @@ - "/var/minecraft/{{ mcname }}/.minecraft" - "/var/minecraft/{{ mcname }}/instance.cfg" - "/var/minecraft/{{ mcname }}/mmc-pack.json" - when: stat_mcroot_multimc.stat.exists + when: not find_multimc is failed when: get_mcpack is changed - name: Check for Forge stat: