diff --git a/inventory/group_vars/all.yaml b/inventory/group_vars/all.yaml index 075397a..74f5451 100644 --- a/inventory/group_vars/all.yaml +++ b/inventory/group_vars/all.yaml @@ -277,7 +277,7 @@ orcaslicer_appimage: nightly: false # Stable only: "latest" (default) or a specific version like "2.3.2" - version: 2.3.2 + version: 2.4.2 # If true and OrcaSlicer is already installed, wipe install_dir and reinstall. force_reinstall: false diff --git a/roles/orcaslicer/defaults/main.yaml b/roles/orcaslicer/defaults/main.yaml index 9cfe491..b71fa1d 100644 --- a/roles/orcaslicer/defaults/main.yaml +++ b/roles/orcaslicer/defaults/main.yaml @@ -6,7 +6,7 @@ orcaslicer_appimage: nightly: false # Stable only: "latest" (default) or a specific version like "2.3.2" - version: 2.3.2 + version: 2.4.2 # If true and OrcaSlicer is already installed, wipe install_dir and reinstall. force_reinstall: false diff --git a/roles/orcaslicer/tasks/main.yaml b/roles/orcaslicer/tasks/main.yaml index 17f1053..5702493 100644 --- a/roles/orcaslicer/tasks/main.yaml +++ b/roles/orcaslicer/tasks/main.yaml @@ -221,6 +221,17 @@ # ------------------------- # Asset selection (both) # ------------------------- +- name: "OrcaSlicer | Compute AppImage arch match regex" + ansible.builtin.set_fact: + _orcaslicer_ai_arch_regex: >- + {{ + 'aarch64' + if ansible_architecture in ['aarch64', 'arm64'] + else '^(?!.*(?:aarch64|arm64)).*' + }} + when: _orcaslicer_ai_do_install + changed_when: false + - name: "OrcaSlicer | Pick AppImage asset from release" ansible.builtin.set_fact: _orcaslicer_ai_asset: >- @@ -229,6 +240,8 @@ _orcaslicer_release_assets | selectattr('name', 'search', '\.AppImage$') | selectattr('name', 'search', orcaslicer_appimage.distro_tag) + | rejectattr('name', 'search', '_belt') + | selectattr('name', 'search', _orcaslicer_ai_arch_regex) | list | first ) | default({}) diff --git a/roles/orcaslicer/templates/orcaslicer.desktop.j2 b/roles/orcaslicer/templates/orcaslicer.desktop.j2 index 79ae2c8..6577542 100644 --- a/roles/orcaslicer/templates/orcaslicer.desktop.j2 +++ b/roles/orcaslicer/templates/orcaslicer.desktop.j2 @@ -5,7 +5,7 @@ TryExec={{ orcaslicer_appimage.install_dir }}/bin/orca-slicer Terminal=false Type=Application Icon=orcaslicer -StartupWMClass=OrcaSlicer +StartupWMClass=orca-slicer Comment=OrcaSlicer 3D printing slicer Categories=Graphics;3DGraphics; MimeType=model/3mf;model/stl;