aboutsummaryrefslogtreecommitdiffci
path: root/scripts
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/fedora-kiwi-bundle-format-generator8
-rwxr-xr-xscripts/fedora-live-iso-label-generator4
2 files changed, 8 insertions, 4 deletions
diff --git a/scripts/fedora-kiwi-bundle-format-generator b/scripts/fedora-kiwi-bundle-format-generator
index 7c48324..a03d253 100755
--- a/scripts/fedora-kiwi-bundle-format-generator
+++ b/scripts/fedora-kiwi-bundle-format-generator
@@ -14,6 +14,7 @@ import xml.etree.ElementTree as ET
parser = ArgumentParser(description="Generator of kiwi bundle formats for Fedora image builds")
parser.add_argument("kiwi_file", type=Path, default="Fedora.kiwi", help="kiwi description file")
parser.add_argument("image_profile", type=str, help="kiwi image profile")
+parser.add_argument("--oci-variant", "-o", action="store_true", help="generate oci variant")
args = parser.parse_args()
xml_tree = ET.parse(args.kiwi_file)
@@ -22,4 +23,9 @@ image_root = xml_tree.getroot()
image_basename = image_root.attrib["name"]
image_profile = args.image_profile
-print(f"{image_basename}-{image_profile}-%v.%I.%A")
+image_bundle_format = f"{image_basename}-{image_profile}-%v.%I.%A"
+
+if args.oci_variant:
+ print(f"{image_bundle_format}.%T")
+else:
+ print(image_bundle_format)
diff --git a/scripts/fedora-live-iso-label-generator b/scripts/fedora-live-iso-label-generator
index fc5cef6..b1350de 100755
--- a/scripts/fedora-live-iso-label-generator
+++ b/scripts/fedora-live-iso-label-generator
@@ -32,9 +32,6 @@ volume_id_substitutions = {
"Cinnamon": "Cinn",
"Cloud": "C",
"Comp_Neuro": "CNr",
- "COSMIC": "CSMC",
- "COSMIC-Atomic": "CSMCA",
- "COSMIC_Atomic": "CSMCA",
"Design_suite": "Dsgn",
"Electronic_Lab": "Elec",
"Everything": "E",
@@ -49,6 +46,7 @@ volume_id_substitutions = {
# Note https://pagure.io/pungi-fedora/issue/533
"Python-Classroom": "Clss",
"Python_Classroom": "Clss",
+ "Robotics": "Robo",
"Scientific_KDE": "SciK",
"Security": "Sec",
"Sericea": "Src",