Changed the default download URL to pull from GitHub since blender.org blocks the Python HTTP library
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
||||
{% from "blender/map.jinja" import blender with context %}
|
||||
|
||||
# 1. Download and extract archive
|
||||
# 1. Download and extract directly from GitHub Releases
|
||||
blender_extract_tarball:
|
||||
archive.extracted:
|
||||
- name: {{ blender.archive_dir }}
|
||||
|
||||
+6
-7
@@ -1,23 +1,22 @@
|
||||
{% set default_version = '4.2.0' %}
|
||||
{% set default_major = default_version.split('.')[0] ~ '.' ~ default_version.split('.')[1] %}
|
||||
|
||||
{% set defaults = {
|
||||
'version': default_version,
|
||||
'install_root': '/opt',
|
||||
'bin_dir': '/usr/local/bin',
|
||||
'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 #}
|
||||
{% set blender = salt['pillar.get']('blender', default=defaults, merge=True) %}
|
||||
|
||||
{# Calculate derived paths dynamically #}
|
||||
{% set major_version = blender.version.split('.')[0] ~ '.' ~ blender.version.split('.')[1] %}
|
||||
{% set archive_name = 'blender-' ~ blender.version ~ '-linux-x64' %}
|
||||
{# Derived variables #}
|
||||
{% set tag_name = 'v' ~ blender.version %}
|
||||
{% set archive_name = 'blender-' ~ blender.version ~ '-linux-x64.tar.xz' %}
|
||||
|
||||
{% 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',
|
||||
'download_url': blender.download_url_base ~ '/' ~ archive_name ~ '.tar.xz'
|
||||
'download_url': blender.download_url_base ~ '/' ~ tag_name ~ '/' ~ archive_name
|
||||
}) %}
|
||||
Reference in New Issue
Block a user