Merge branch 'master' into production

1 files changed, 58 insertions, 63 deletions

diff --git a/_scripts/generate_releases.lua b/_scripts/generate_releases.lua
index c064f74..091200c 100644
--- a/_scripts/generate_releases.lua
+++ b/_scripts/generate_releases.lua
@@ -6,72 +6,66 @@ url_prefix="https://nl.alpinelinux.org/alpine"
 t = { flavors={} }
 
 flavor_def = {
-	["alpine-standard"] = {
+	{
+		flavor = "alpine-standard",
 		title = "Standard",
-		desc = {
-			"Alpine as it was intended",
-			"Just enough to get you started",
-			"Network connection recommended",
-		},
-	},
-	["alpine-extended"] = {
+		desc = "Alpine as it was intended.\n"..
+			"Just enough to get you started.\n"..
+			"Network connection required.",
+	}, {
+		flavor = "alpine-extended",
 		title = "Extended",
-		desc = {
-			"Most common used packages included",
-			"Suitable for routers and servers",
-			"Runs from RAM",
-		},
-	},
-	["alpine-vanilla"] = {
+		desc = "Most common used packages included.\n"..
+			"Suitable for routers and servers.\n"..
+			"Runs from RAM.",
+	}, {
+		flavor = "alpine-vanilla",
 		title = "Vanilla",
-		desc = {
-			"Includes a vanilla kernel",
-			"Does not include grsec patch set",
-			"Suitable for debugging",
-		},
-	},
-	["alpine-virt"] = {
+		desc = "Includes a vanilla kernel.\n"..
+			"Does not include grsec patch set.\n"..
+			"Suitable for debugging.",
+	}, {
+		flavor = "alpine-virt",
 		title = "Virtual",
-		desc = {
-			"Similar to standard",
-			"Slimmed down kernel",
-			"Optimized for virtual systems",
-		},
-	},
-	["alpine-xen"] = {
+		desc = "Similar to standard.\n"..
+			"Slimmed down kernel.\n"..
+			"Optimized for virtual systems.",
+	}, {
+		flavor = "alpine-xen",
 		title = "Xen",
-		desc = {
-			"Build-in support for Xen Hypervisor",
-			"Includes packages targed at Xen usage",
-			"Includes grsec kernel",
-		},
-	},
-	["alpine-minirootfs"] = {
+		desc = "Build-in support for Xen Hypervisor.\n"..
+			"Includes packages targed at Xen usage.\n"..
+			"Includes grsec kernel.",
+	}, {
+		flavor = "alpine-minirootfs",
 		title = "Mini root filesystem",
-		desc = {
-			"Minimal root filesystem",
-			"For use in containers",
-			"and minimal chroots",
-		},
-	},
-	["alpine-rpi"] = {
+		desc = "Minimal root filesystem.\n"..
+			"For use in containers.\n"..
+			"and minimal chroots"
+	}, {
+		flavor = "alpine-rpi",
 		title = "Raspberry Pi",
-		desc = {
-			"Includes Raspberry Pi kernel",
-			"Does not include grsec patchset",
+		desc = "Includes Raspberry Pi kernel.\n"..
+			"Does not include grsec patchset.\n",
 			"And much more...",
-		},
-	},
-	["alpine-uboot"] = {
+	}, {
+		flavor = "alpine-uboot",
 		title = "Generic ARM",
-		desc = {
-			"Has default ARM kernel",
-			"Includes the uboot bootloader",
-			"Supports armhf and aarch64",
-		}
+		desc = "Has default ARM kernel.\n"..
+			"Includes the uboot bootloader.\n"..
+			"Supports armhf and aarch64.",
 	}
 }
 
+
+-- number of different colors for flavors in CSS
+num_colors = 7
+
+flavor_index = {}
+for i,f in pairs(flavor_def) do
+	flavor_index[f.flavor] = i
+end
+
 for i = 1,#arg do
 	local f = assert(io.open(arg[i]))
 
@@ -86,25 +80,26 @@ for i = 1,#arg do
 		v.sig_url = ("%s.sig"):format(v.iso_url)
 		v.size_mb=math.floor(v.size/(1024*1024))
 
-
-		local flavor = t[v.flavor]
+		local n = flavor_index[v.flavor]
+		local flavor = t.flavors[n]
 		if flavor == nil then
-			local def = flavor_def[v.flavor] or {title="", desc=""}
+			local def = flavor_def[n] or {title="", desc=""}
 			flavor = {
 				archs = {},
-				flavor_title = def.title,
-				flavor_desc = def.desc,
+				flavor_title = v.title or def.title,
+				flavor_desc = v.desc or def.desc,
 				flavor_name = string.lower(v.flavor),
+				flavor_color = (flavor_index[v.flavor]-1) % num_colors
 			}
-			table.insert(t.flavors, flavor)
+			t.flavors[n] = flavor
 		end
-		flavor[v.arch] = v
+--		flavor[v.arch] = v
 		table.insert(flavor.archs, v)
-		t[v.flavor] = flavor
+--		t[v.flavor] = flavor
 	end
 end
 
 -- default release
-t.default = t["alpine-standard"].x86_64
+t.default = t.flavors[1].archs[1]
 
 io.write(lyaml.dump{t})