Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/fedora-kiwi-bundle-format-generator | 8 | ||||
| -rwxr-xr-x | scripts/fedora-live-iso-label-generator | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/scripts/fedora-kiwi-bundle-format-generator b/scripts/fedora-kiwi-bundle-format-generator index a03d253..7c48324 100755 --- a/scripts/fedora-kiwi-bundle-format-generator +++ b/scripts/fedora-kiwi-bundle-format-generator @@ -14,7 +14,6 @@ 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) @@ -23,9 +22,4 @@ image_root = xml_tree.getroot() image_basename = image_root.attrib["name"] image_profile = args.image_profile -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) +print(f"{image_basename}-{image_profile}-%v.%I.%A") diff --git a/scripts/fedora-live-iso-label-generator b/scripts/fedora-live-iso-label-generator index b1350de..fc5cef6 100755 --- a/scripts/fedora-live-iso-label-generator +++ b/scripts/fedora-live-iso-label-generator @@ -32,6 +32,9 @@ 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", @@ -46,7 +49,6 @@ 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", |