From 27ece14323558c22818847e595f01b9b30bf4b0f Mon Sep 17 00:00:00 2001
From: Tiger3018 <tiger3018of02@gmail.com>
Date: Wed, 9 Nov 2022 22:31:22 +0800
Subject: [PATCH] genisoinfo: change patterns for ubuntu(-core) iso file.

---
 geninfo/genisolist.ini | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/geninfo/genisolist.ini b/geninfo/genisolist.ini
index 298b38c..2dafe19 100644
--- a/geninfo/genisolist.ini
+++ b/geninfo/genisolist.ini
@@ -79,9 +79,9 @@ platform = $2
 distro = Ubuntu
 listvers = 4
 location = ubuntu-cdimage/releases/[a-z]*/release/ubuntu-*-preinstalled-desktop-*.img.xz
-pattern = ubuntu-([0-9.]+)-preinstalled-desktop-(\w+).img.xz
+pattern = ubuntu-([0-9.]+)-preinstalled-desktop-(.+).img.xz
 version = $1
-type = Desktop LiveDVD/.img.xz
+type = Preinstalled Desktop
 platform = $2
 
 [ubuntu_live_server]
@@ -91,7 +91,7 @@ listvers = 4
 # to specify more globs. N start from 0 and must a sequence (0,1,2...).
 location_0 = ubuntu-releases/[a-z]*/ubuntu-*-live-server-*.iso
 location_1 = ubuntu-cdimage/releases/[a-z]*/release/ubuntu-*-live-server-*.iso
-pattern = ubuntu-([0-9.]+)-live-server-(\w+).iso
+pattern = ubuntu-([0-9.]+)-live-server-(.+).iso
 version = $1
 type = Server
 platform = $2
@@ -100,9 +100,9 @@ platform = $2
 distro = Ubuntu
 listvers = 4
 location = ubuntu-cdimage/releases/[a-z]*/release/ubuntu-*-preinstalled-server-*.img.xz
-pattern = ubuntu-([0-9.]+)-preinstalled-server-(\w+).img.xz
+pattern = ubuntu-([0-9.]+)-preinstalled-server-(.+).img.xz
 version = $1
-type = Server/.img.xz
+type = Preinstalled Server
 platform = $2
 
 # If live and preinstalled server match failed, fallback to default server.
@@ -187,7 +187,7 @@ type = network installer directory
 [ubuntu_core]
 distro = Ubuntu Core
 location = ubuntu-cdimage/ubuntu-core/*/stable/current/ubuntu-core-*.img.xz
-pattern = ubuntu-core-([0-9.]+)-(\w+).img.xz
+pattern = ubuntu-core-([0-9]+)-(.+).img.xz
 version = $1
 platform = $2
 listvers = 3