Git-Mirrors/qusal
1
0
Fork 0
mirror of https://github.com/ben-grande/qusal.git synced 2025-03-02 11:49:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: unify method to query template version

Browse Source 
Copying issue when creating the formula from its predecessor.
This commit is contained in:
Ben Grande 2025-02-27 11:49:47 +01:00
parent a67c6c6815
commit d639aa97e4
No known key found for this signature in database
GPG Key ID: 00C64E14F51F9E56
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/debian-xfce/template.jinja
View File

@ -1,15 +1,16 @@
{#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% set base = 'debian' -%}
{% set version = salt['pillar.get']('qvm:debian:version', '12') -%}
{%- import "debian/template.jinja" as template_base -%}
{% set base = template_base.base -%}
{% set version = template_base.version -%}
{% set flavor = 'xfce' -%}
{% set repo = salt['pillar.get']('qvm:debian:repo', 'qubes-templates-itl') -%}
{% set repo = template_base.repo -%}
{% if flavor -%}
{% set flavor = '-' ~ flavor -%}
{% endif -%}
{% set template = base ~ '-' ~ version ~ flavor -%}
{% set template = base ~ '-' ~ version ~ flavor -%}
{% set template_clean = base ~ flavor -%}

11
salt/fedora-xfce/template.jinja
View File

@ -1,15 +1,16 @@
{#
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-FileCopyrightText: 2023 - 2025 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% set base = 'fedora' -%}
{% set version = salt['pillar.get']('qvm:fedora:version', '39') -%}
{%- import "fedora/template.jinja" as template_base -%}
{% set base = template_base.base -%}
{% set version = template_base.version -%}
{% set flavor = 'xfce' -%}
{% set repo = salt['pillar.get']('qvm:fedora:repo', 'qubes-templates-itl') -%}
{% set repo = template_base.repo -%}
{% if flavor -%}
{% set flavor = '-' ~ flavor -%}
{% endif -%}
{% set template = base ~ '-' ~ version ~ flavor -%}
{% set template = base ~ '-' ~ version ~ flavor -%}
{% set template_clean = base ~ flavor -%}