Salt-Formulas/blender-formula
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the default download URL to pull from GitHub since blender.org blocks the Python HTTP library

Browse Source
This commit is contained in:
Gregory Ballantine
2026-08-10 05:57:04 -04:00
parent 5c7adf481e
commit 3b8ae0e0cf
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blender/init.sls
+1 -1
View File
@@ -1,6 +1,6 @@
{% from "blender/map.jinja" import blender with context %} {% from "blender/map.jinja" import blender with context %}
# 1. Download and extract archive # 1. Download and extract directly from GitHub Releases
blender_extract_tarball: blender_extract_tarball:
archive.extracted: archive.extracted:
- name: {{ blender.archive_dir }} - name: {{ blender.archive_dir }}
blender/map.jinja
+6 -7
View File
@@ -1,23 +1,22 @@
{% set default_version = '4.2.0' %} {% set default_version = '4.2.0' %}
{% set default_major = default_version.split('.')[0] ~ '.' ~ default_version.split('.')[1] %}
{% set defaults = { {% set defaults = {
'version': default_version, 'version': default_version,
'install_root': '/opt', 'install_root': '/opt',
'bin_dir': '/usr/local/bin', 'bin_dir': '/usr/local/bin',
'desktop_dir': '/usr/share/applications', 'desktop_dir': '/usr/share/applications',
'download_url_base': 'https://download.blender.org/release/Blender' ~ default_major 'download_url_base': 'https://github.com/blender/blender/releases/download'
} %} } %}
{# Merge pillar data under the 'blender' key over defaults #} {# Merge pillar data under the 'blender' key over defaults #}
{% set blender = salt['pillar.get']('blender', default=defaults, merge=True) %} {% set blender = salt['pillar.get']('blender', default=defaults, merge=True) %}
{# Calculate derived paths dynamically #} {# Derived variables #}
{% set major_version = blender.version.split('.')[0] ~ '.' ~ blender.version.split('.')[1] %} {% set tag_name = 'v' ~ blender.version %}
{% set archive_name = 'blender-' ~ blender.version ~ '-linux-x64' %} {% set archive_name = 'blender-' ~ blender.version ~ '-linux-x64.tar.xz' %}
{% do blender.update({ {% do blender.update({
'archive_dir': blender.install_root ~ '/' ~ archive_name, 'archive_dir': blender.install_root ~ '/blender-' ~ blender.version ~ '-linux-x64',
'symlink_dir': blender.install_root ~ '/blender', 'symlink_dir': blender.install_root ~ '/blender',
'download_url': blender.download_url_base ~ '/' ~ archive_name ~ '.tar.xz' 'download_url': blender.download_url_base ~ '/' ~ tag_name ~ '/' ~ archive_name
}) %} }) %}