From 3b8ae0e0cf872840bf610c64cc5e0e8b93d482b0 Mon Sep 17 00:00:00 2001
From: Gregory Ballantine <gballantine@metaunix.net>
Date: Mon, 10 Aug 2026 05:57:04 -0400
Subject: [PATCH] Changed the default download URL to pull from GitHub since
 blender.org blocks the Python HTTP library

---
 blender/init.sls  |  2 +-
 blender/map.jinja | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/blender/init.sls b/blender/init.sls
index 65ec4d9..19c28b4 100644
--- a/blender/init.sls
+++ b/blender/init.sls
@@ -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 }}
diff --git a/blender/map.jinja b/blender/map.jinja
index 0cd6c25..4dd8481 100644
--- a/blender/map.jinja
+++ b/blender/map.jinja
@@ -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
 }) %}
\ No newline at end of file