diff --git a/7zip.sls b/7zip.sls index 8440b9e7..036f0d7f 100644 --- a/7zip.sls +++ b/7zip.sls @@ -1,35 +1,42 @@ # both 32-bit (x86) AND a 64-bit (AMD64) installer available -{% set versions = { - '24': ['08', '07', '06', '05', '04', '03', '02', '01', '00'], - '23': ['01'], - '22': ['01'], - '19': ['00'] - } -%} {% set source_path = 'https://d.7-zip.org/a/' %} +{%- load_yaml as versions %} +- '24.08' +- '24.07' +- '24.06' +- '24.05' +- '24.04' +- '24.03' +- '24.02' +- '24.01' +- '23.01' +- '22.01' +- '19.01' +{%- endload %} 7zip: -{% for major, subversions in versions.items() %} -{% for minor in subversions %} - '{{major}}.{{minor}}.00.0': - {% if grains['cpuarch'] == 'AMD64' %} - full_name: '7-Zip {{major}}.{{minor}} (x64 edition)' - installer: '{{ source_path }}7z{{major}}{{minor}}-x64.msi' - uninstaller: '{{ source_path }}7z{{major}}{{minor}}-x64.msi' - arch: x64 - {% else %} - full_name: '7-Zip {{major}}.{{minor}}' - installer: '{{ source_path }}7z{{major}}{{minor}}.msi' - uninstaller: '{{ source_path }}7z{{major}}{{minor}}.msi' - arch: x86 - {% endif %} - install_flags: '/qn /norestart' - uninstall_flags: '/qn /norestart' - msiexec: True - locale: en_US - reboot: False -{% endfor %} -{% endfor %} +{%- for version in versions %} + {%- set major_minor = version.split('.') %} + {%- set major = major_minor[0] %} + {%- set minor = major_minor[1] %} + '{{version}}.00.0': + {% if grains['cpuarch'] == 'AMD64' %} + full_name: '7-Zip {{version}} (x64 edition)' + installer: '{{ source_path }}7z{{major}}{{minor}}-x64.msi' + uninstaller: '{{ source_path }}7z{{major}}{{minor}}-x64.msi' + arch: x64 + {% else %} + full_name: '7-Zip {{major}}.{{minor}}' + installer: '{{ source_path }}7z{{major}}{{minor}}.msi' + uninstaller: '{{ source_path }}7z{{major}}{{minor}}.msi' + arch: x86 + {% endif %} + install_flags: '/qn /norestart' + uninstall_flags: '/qn /norestart' + msiexec: True + locale: en_US + reboot: False +{%- endfor %} # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~