salt/ansible
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hopefully fix erroneous MultiMC pack detection

Browse Source
This commit is contained in:
Salt 2020-06-24 10:29:58 -05:00
parent b044082ea1
commit 8e9f6a9582
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
roles/minecraft/tasks/main.yml
View File

@ -70,19 +70,21 @@
remote_src: yes remote_src: yes
dest: "/var/minecraft/{{ mcname }}" dest: "/var/minecraft/{{ mcname }}"
notify: "restart minecraft {{ mcname }}" notify: "restart minecraft {{ mcname }}"
- name: Check for MultiMC pack - name: Look for MultiMC pack
stat: find:
path: "/var/minecraft/{{ mcname }}/.minecraft" path: "/var/minecraft/{{ mcname }}"
register: stat_mcroot_multimc patterns: '.minecraft'
ignore_errors: yes
register: find_multimc
- name: Move .minecraft contents to root - name: Move .minecraft contents to root
command: command:
chdir: "/var/minecraft/{{ mcname }}" chdir: "/var/minecraft/{{ mcname }}"
argv: argv:
- mv - mv
- "/var/minecraft/{{ mcname }}/.minecraft/*" - "/var/minecraft/{{ mcname }}/*/.minecraft/*"
- "." - "."
notify: "restart minecraft {{ mcname }}" notify: "restart minecraft {{ mcname }}"
when: stat_mcroot_multimc.stat.exists when: not find_multimc is failed
- name: Remove MultiMC artifacts - name: Remove MultiMC artifacts
file: file:
path: "{{ item }}" path: "{{ item }}"
@ -91,7 +93,7 @@
- "/var/minecraft/{{ mcname }}/.minecraft" - "/var/minecraft/{{ mcname }}/.minecraft"
- "/var/minecraft/{{ mcname }}/instance.cfg" - "/var/minecraft/{{ mcname }}/instance.cfg"
- "/var/minecraft/{{ mcname }}/mmc-pack.json" - "/var/minecraft/{{ mcname }}/mmc-pack.json"
when: stat_mcroot_multimc.stat.exists when: not find_multimc is failed
when: get_mcpack is changed when: get_mcpack is changed
- name: Check for Forge - name: Check for Forge
stat: stat: