device-db: Add catch-all for hyphenated HWIDs, fix errors

Signed-off-by: Matt DeVillier <[email protected]>

Author: MrChromebox

device-db.sh

@@ -46,7 +46,6 @@ DEVICE_DB=(
 	["BANJO*"]="Acer Chromebook 15 (CB3-531)|BYT|||"
 	["CANDY*"]="Dell Chromebook 11 (3120)|BYT|||"
 	["CLAPPER*"]="Lenovo N20/N20P Chromebook|BYT|||"
-	["ENGUARDE*"]="(multiple device matches)|BYT|||"
 	["ENGUARDE ???-???-??A*"]="CTL N6 Education Chromebook|BYT|||"
 	["ENGUARDE ???-???-??B*"]="M&A Chromebook|BYT|||"
 	["ENGUARDE ???-???-??C*"]="Senkatel C1101 Chromebook|BYT|||"
@@ -58,9 +57,11 @@ DEVICE_DB=(
 	["ENGUARDE ???-???-??I*"]="Videonet Chromebook|BYT|||"
 	["ENGUARDE ???-???-??J*"]="eduGear Chromebook R|BYT|||"
 	["ENGUARDE ???-???-??K*"]="ASI Chromebook|BYT|||"
+	["ENGUARDE*"]="Enguarde BYT Chromebook|BYT|||"
 	["EXPRESSO ???-???-??A*"]="HEXA Chromebook Pi|BYT|||"
 	["EXPRESSO ???-???-??B*"]="Bobicus Chromebook 11|BYT|||"
 	["EXPRESSO ???-???-??C*"]="Edxis Chromebook|BYT|||"
+	["EXPRESSO*"]="Expresso BYT Chromebook|BYT|||"
 	["GLIMMER*"]="Lenovo ThinkPad 11e/Yoga Chromebook|BYT|||"
 	["GNAWTY*"]="Acer Chromebook 11 (CB3-111/131, C730/C730E/C735)|BYT|||"
 	["HELI*"]="Haier Chromebook 11 G2|BYT|||"
@@ -87,6 +88,7 @@ DEVICE_DB=(
 	["RELM ???-F*"]="Mecer V2 Chromebook|BSW|||"
 	["RELM ???-G*"]="HP Chromebook 11 G5 EE|BSW|||"
 	["RELM ???-Z*"]="Quanta OEM Chromebook|BSW|||"
+	["RELM*"]="Relm BSW Chromebook|BSW|||"
 	["SETZER*"]="HP Chromebook 11 G5|BSW|||"
 	["TERRA*"]="ASUS Chromebook C202SA, C300SA/C301SA|BSW|||"
 	["TERRA ???-???-???-A*"]="ASUS Chromebook C202SA|BSW|||"
@@ -143,7 +145,7 @@ DEVICE_DB=(
 	["EXCELSIOR*"]="Google Meet kit (KBL)|KBL|fizz|isCbox,hasLAN|"
 	["EXCELSIOR-OOLH*"]="CTL Google Meet kit (KBL)|KBL|fizz|isCbox,hasLAN|"
 	["EXCELSIOR-URAR*"]="Asus Google Meet kit (KBL)|KBL|fizz|isCbox,hasLAN|"
-	["FIZZ"]="TBD KBL Chromebox|KBL||isCbox,hasLAN|"
+	["FIZZ*"]="Fizz KBL Chromebox|KBL||isCbox,hasLAN|"
 	["JAX*"]="AOpen Chromebox Commercial 2|KBL|fizz|isCbox,hasLAN|"
 	["KARMA*"]="Acer Chromebase 24I2|KBL||kbl_rwl18|"
 	["KENCH*"]="HP Chromebox G2|KBL|fizz|isCbox,hasLAN|"
@@ -230,6 +232,7 @@ DEVICE_DB=(
 	["WYVERN-HOIZ*"]="Wyvern MobLab|CML||isCbox,hasLAN|"
 	["WYVERN-JOTV*"]="Promethean Chromebox 2|CML||isCbox,hasLAN|"
 	["WYVERN-JRVR*"]="ViewSonic NMP760 Chromebox|CML||isCbox,hasLAN|"
+	["WYVERN*"]="Wyvern CML Chromebox|CML||isCbox,hasLAN|"
 	# Drallion baseboard
 	["DRALLION*"]="Dell Latitude 7410 Chromebook Enterprise|CML|drallion||"
 
@@ -242,10 +245,10 @@ DEVICE_DB=(
 	["BEADRIX-ULGS*"]="Evolve III Chromebook 11 E1|JSL|||"
 	["BEADRIX-XEER*"]="Positivo Chromebook N2320|JSL|||"
 	["BEADRIX-XYBG*"]="Allied Chromebook 11 N5100EO-864180|JSL|||"
+	["BEADRIX*"]="Beadrix JSL Chromebook|JSL|||"
 	["BEETLEY*"]="Lenovo Flex 3i Chromebook 15 IdeaPad Flex 3i Chromebook|JSL|||"
 	["BLIPPER*"]="Lenovo 3i-15 Chromebook|JSL|||"
-	["BOOKEM-LPEW*"]="Lenovo 100e Chromebook Gen 3|JSL|||"
-	["BOOKEM-SEOI*"]="Lenovo Chromebook 11|JSL|||"
+	["BOOKEM*"]="Lenovo Chromebook 11 / 100e Gen 3|JSL|||"
 	["BOTENFLEX*"]="Lenovo Flex 3i-11 Chromebook|JSL|||"
 	["BOTEN*"]="Lenovo 500e Chromebook Gen 3|JSL|||"
 	["BOXY*"]="Lenovo Chromebox Micro|JSL||isCbox,hasLAN|"
@@ -278,6 +281,8 @@ DEVICE_DB=(
 	["KRACKO-WYQT*"]="Edxis Chromebook 11 (S30-C)|JSL|||"
 	["KRACKO-XJKD*"]="Multilaser Chromebook M11HC-PC916|JSL|||"
 	["KRACKO-YKWP*"]="Positivo Chromebook N2310|JSL|||"
+	["KRACKO360*"]="Kracko 360 JSL Chromebook|JSL|||"
+	["KRACKO*"]="Kracko JSL Chromebook|JSL|||"
 	["LANDIA*"]="HP Chromebook x360 14a-ca1|JSL|||"
 	["LANDRID*"]="HP Chromebook 15a|JSL|||"
 	["LANTIS*"]="HP Chromebook 14a|JSL|||"
@@ -289,14 +294,17 @@ DEVICE_DB=(
 	["MAGMA*"]="Acer Chromebook 315|JSL|||"
 	["MAGNETO-BWYB*"]="Acer Chromebook 314|JSL|||"
 	["MAGNETO-SGGB*"]="Packard Bell Chromebook 314|JSL|||"
+	["MAGNETO*"]="Magneto JSL Chromebook|JSL|||"
 	["MAGOLOR*"]="Acer Chromebook Spin 511|JSL|||"
 	["MAGPIE*"]="Acer Chromebook 317|JSL|||"
 	["METAKNIGHT*"]="NEC Chromebook Y3|JSL|||"
 	["PALUTENA-JOWH*"]="CA14J2|JSL|||"
 	["PALUTENA-TQFG*"]="Gateway Chromebook 314|JSL|||"
 	["PALUTENA-YVYF*"]="Acer Chromebook 314|JSL|||"
+	["PALUTENA*"]="Palutena JSL Chromebook|JSL|||"
 	["PASARA-RTKU*"]="Edxis E-Lite Chromebook 15|JSL|||"
 	["PASARA-TZNR*"]="Gateway Chromebook 15|JSL|||"
+	["PASARA*"]="Pasara JSL Chromebook|JSL|||"
 	["PEEZER-ABCD*"]="CA11J2 45Wh|JSL|||"
 	["PEEZER-EUBP*"]="Multilaser Chromebook M11C-PC924|JSL|||"
 	["PEEZER-FYEL*"]="CTL Chromebook PX11EG|JSL|||"
@@ -305,21 +313,24 @@ DEVICE_DB=(
 	["PEEZER-RRAJ*"]="Gateway Chromebook 311|JSL|||"
 	["PEEZER-UGDD*"]="CA11J2|JSL|||"
 	["PEEZER-ZQNH*"]="Zyrex Chromebook M432-2P|JSL|||"
+	["PEEZER*"]="Peezer JSL Chromebook|JSL|||"
 	["PIRETTE-AZUJ*"]="Allied Chromebook 11 N5100P|JSL|||"
 	["PIRETTE-LLJI*"]="Axioo Chromebook P11|JSL|||"
 	["PIRETTE-NGVJ*"]="SPC Chromebook Z1 Mini|JSL|||"
 	["PIRETTE-RVKU*"]="CTL Chromebook PX11E|JSL|||"
 	["PIRETTE-UBKE*"]="Zyrex Chromebook M432-2|JSL|||"
+	["PIRETTE*"]="Pirette JSL Chromebook|JSL|||"
 	["PIRIKA-BMAD*"]="CTL Chromebook Enterprise|JSL|||"
 	["PIRIKA-CMMK*"]="Arai Nimbus S1 Chromebook Enterprise|JSL|||"
 	["PIRIKA-NPXS*"]="Axioo Chromebook P14|JSL|||"
 	["PIRIKA-OXAV*"]="Edxis E-Lite Chromebook 14|JSL|||"
 	["PIRIKA-XAJY*"]="Gateway Chromebook 14|JSL|||"
+	["PIRIKA*"]="Pirika JSL Chromebook|JSL|||"
 	["SASUKE*"]="Samsung Galaxy Chromebook Go|JSL|||"
 	["SASUKETTE*"]="Samsung Galaxy Chromebook Go 11|JSL|||"
 	["STORO360*"]="ASUS Chromebook Flip CR1100FKA|JSL|||"
 	["STORO*"]="ASUS Chromebook CR1100CKA|JSL|||"
-	["TARANZA-RPOG*"]="ASUS Fanless Chromebox CF40|JSL||isCbox,hasLAN|"
+	["TARANZA*"]="ASUS Fanless Chromebox CF40|JSL||isCbox,hasLAN|"
 
 	# TGL devices - Intel TigerLake
 	["CHRONICLER*"]="FMV Chromebook 14F|TGL|||"
@@ -367,13 +378,15 @@ DEVICE_DB=(
 	["BUJIA-IFBL*"]="AOPEN Chromebox OPS|ADL||isCbox,hasLAN,adl_fixed_rwl|"
 	["BUJIA-TEDS*"]="Bujia Development Product|ADL||isCbox,hasLAN,adl_fixed_rwl|"
 	["BUJIA-XMII*"]="IMAGO Chromebox OPS|ADL||isCbox,hasLAN,adl_fixed_rwl|"
+	["BUJIA*"]="Bujia ADL Chromebox|ADL||isCbox,hasLAN,adl_fixed_rwl|"
 	["GLADIOS*"]="HP Chromebox Enterprise G4|ADL||isCbox,hasLAN,adl_fixed_rwl|"
 	["KINOX*"]="Lenovo ThinkCentre M60q Chromebox|ADL||isCbox,hasLAN,adl_fixed_rwl|"
 	["KULDAX*"]="ASUS Chromebox 5/5a (CN67)|ADL||isCbox,hasLAN,adl_fixed_rwl|"
 	["LISBON-GURF*"]="CTL Chromebox CBx3|ADL||isCbox,hasLAN,adl_fixed_rwl|"
 	["LISBON-IGDX*"]="Promethean Chromebox 3|ADL||isCbox,hasLAN,adl_fixed_rwl|"
 	["LISBON-TVCI*"]="Lisbon Development Product|ADL||isCbox,hasLAN,adl_fixed_rwl|"
 	["LISBON-WFCT*"]="Centerm Chromebox D661|ADL||isCbox,hasLAN,adl_fixed_rwl|"
+	["LISBON*"]="Lisbon ADL Chromebox|ADL||isCbox,hasLAN,adl_fixed_rwl|"
 	["MOLI*"]="Acer Chromebox CXI5|ADL||isCbox,hasLAN,adl_fixed_rwl|"
 	["MOXIE*"]="Acer Chromebox CXI6|ADL||isCbox,hasLAN,adl_fixed_rwl|"
 	# Brask baseboard / constitution recovery image
@@ -404,49 +417,48 @@ DEVICE_DB=(
 	["GLASSWAY-IEIH*"]="Poin2 Chromebook Plus 14|ADN|||"
 	["GLASSWAY-RKFM*"]="CTL Chromebook Plus PX141GX|ADN|||"
 	["GLASSWAY-XVLV*"]="CTL Chromebook Enterprise PX141E|ADN|||"
+	["GLASSWAY*"]="Glassway ADL-N Chromebook|ADN|||"
 	["GOTHRAXCS-AIBU*"]="Centerm Chromebook M612A|ADN|||"
 	["GOTHRAXCS-GTCE*"]="GothraxCS|ADN|||"
 	["GOTHRAXCS-PTVI*"]="Positivo Chromebook N2420|ADN|||"
 	["GOTHRAXCS-TXQV*"]="Multi Chromebook M11C-PC926|ADN|||"
+	["GOTHRAXCS*"]="GothraxCS ADL-N Chromebook|ADN|||"
 	["GOTHRAX-FENM*"]="Gothrax|ADN|||"
 	["GOTHRAX-LFWA*"]="Positivo Chromebook N2422|ADN|||"
 	["GOTHRAX-LQNQ*"]="Centerm Chromebook M612B|ADN|||"
 	["GOTHRAX-OEER*"]="Aiwa Chromebook S11|ADN|||"
 	["GOTHRAX-SKZO*"]="Multi Chromebook M11HC-PC925|ADN|||"
 	["GOTHRAX-UZGM*"]="Acer Chromebook Spin 311(ROA732LTN)|ADN|||"
-	["GUREN360-ACZK*"]="Pegatron CA32TC|ADN|||"
-	["GUREN360-XAGT*"]="Poin2 Chromebook 12P|ADN|||"
-	["GUREN-QPEQ*"]="CTL Chromebook PX121E|ADN|||"
-	["GUREN-XQKZ*"]="Pegatron CA31T|ADN|||"
-	["HIDEO-JDWQ*"]="Centerm Chromebook Plus M621|ADN|||"
-	["HIDEO-ZBXY*"]="Centerm Chromebook M621|ADN|||"
+	["GOTHRAX*"]="Gothrax ADL-N Chromebook|ADN|||"
+	["GUREN360*"]="Poin2 Chromebook 12P / Pegatron CA32TC|ADN|||"
+	["GUREN*"]="Pegatron CA31T / CTL Chromebook PX121E|ADN|||"
+	["HIDEO*"]="Centerm Chromebook M621|ADN|||"
 	["JOXER*"]="HP Chromebook x360 14b|ADN|||"
-	["PUJJO"]="Lenovo 500e Yoga/Flex 3i Chromebook|ADN|||"
 	["PUJJO-DCCV*"]="Lenovo Flex 3i Chromebook 12\"|ADN|||"
 	["PUJJO-KTLR*"]="Lenovo 500e Yoga Chromebook Gen 4|ADN|||"
 	["PUJJO1E*"]="Lenovo 100e Chromebook Gen 4 (Intel)|ADN|||"
 	["PUJJOFLEX*"]="Lenovo IdeaPad Flex 3i Chromebook|ADN|||"
 	["PUJJOGA*"]="Lenovo 500e Chromebook Gen 4s|ADN|||"
 	["PUJJOGATWIN*"]="Lenovo 500e Chromebook Gen 4s|ADN|||"
-	["PUJJONIRU-BFAP*"]="Lenovo Chromebook Plus 2-in-1 14ITN10|ADN|||"
-	["PUJJONIRU-OQXD*"]="Lenovo Chromebook 2-in-1 14ITN10|ADN|||"
-	["PUJJOTEEN(15W)-CZPM*"]="Lenovo 14e Chromebook Gen 3|ADN|||"
+	["PUJJONIRU*"]="Lenovo Chromebook 2-in-1 14ITN10|ADN|||"
+	["PUJJOTEEN(15W)-CZPM*"]="Lenovo 14e Chromebook Gen 3|ADN|pujjoteen|"
 	["PUJJOTEEN-CZPM*"]="Lenovo 14e Chromebook Gen 3|ADN|||"
 	["PUJJOTEEN(15W)-KCBW*"]="Lenovo 14e Chromebook Gen 3|ADN|||"
 	["PUJJOTEEN-KCBW*"]="Lenovo 14e Chromebook Gen 3|ADN|||"
 	["PUJJOTEEN-JQII*"]="Lenovo 14e Chromebook Gen 3 CB 5|ADN|||"
 	["PUJJOTEEN-JQLW*"]="Lenovo IdeaPad Slim 3i Chromebook Plus|ADN|||"
-	["QUANDISO2-WFEV*"]="LI7C|ADN|||"
-	["QUANDISO2-YOLS*"]="CTL Chromebook NL73 Gen 2|ADN|||"
-	["QUANDISO3602-UFWM*"]="LI7D|ADN|||"
-	["QUANDISO3602-YSOK*"]="CTL Chromebook NL73T Gen 2|ADN|||"
-	["QUANDISO360-MMLE*"]="LI7B|ADN|||"
-	["QUANDISO360-QFNE*"]="CTL Chromebook NL73T|ADN|||"
+	["PUJJOTEEN*"]="Lenovo IdeaPad Slim 3i or 14e Gen 3 Chromebook|ADN|||"
+	["PUJJOTEEN15W*"]="Lenovo 14e Chromebook Gen 3|ADN|pujjoteen||"
+	["PUJJO*"]="Lenovo 500e Yoga/Flex 3i Chromebook|ADN|||"
+	["QUANDISO2*"]="CTL Chromebook NL73 Gen 2|ADN|||"
+	["QUANDISO3602*"]="CTL Chromebook NL73T Gen 2|ADN|||"
+	["QUANDISO360*"]="CTL Chromebook NL73T|ADN|||"
 	["QUANDISO360-UIST*"]="Mouse Chromebook U1-DAU01GY-A|ADN|||"
-	["QUANDISO360-VGVL*"]="Edxis Chromebook 11 (S30-X25)|ADN|||"
+	["QUANDISO360-VGVL*"]="Edxis Chromebook 11 / Mouse Chromebook U1|ADN|||"
+	["QUANDISO360*"]="Edxis Chromebook 11 (S30-X25)|ADN|||"
 	["QUANDISO-ISWD*"]="Edxis Chromebook 11 (S30-C25)|ADN|||"
-	["QUANDISO-QJGI*"]="LI7A|ADN|||"
-	["QUANDISO-REAV*"]="CTL Chromebook NL73|ADN|||"
+	["QUANDISO-REAV*"]="CTL Chromebook NL73 / Edxis Chromebook 11|ADN|||"
+	["QUANDISO*"]="CTL Chromebook NL73|ADN|||"
 	["RIVEN*"]="Acer Chromebook Spin 511|ADN|||"
 	["RORIC*"]="Acer Chromebook Plus 514|ADN|||"
 	["RUDRIKS*"]="Acer Chromebook Spin 512|ADN|||"
@@ -482,10 +494,10 @@ DEVICE_DB=(
 	["KASUMI360*"]="Acer Chromebook Spin 311 (R721T)|STR|kasumi||"
 	["KASUMI*"]="Acer Chromebook 311 (C721)|STR|||"
 	["LIARA*"]="Lenovo 14e Chromebook|STR|||"
-	["TREEYA*"]="Lenovo 100e Gen 2 AST|STR|||"
-	["TREEYA360*"]="Lenovo 300e Gen 2 AST|STR|treeya||"
-	["TREEYA360-TZIV*"]="NEC Chromebook Y1 Gen2A|STR|treeya||"
 	["TREEYA-QCDF*"]="Lenovo IdeaPad 3 Chromebook|STR|||"
+	["TREEYA360-TZIV*"]="NEC Chromebook Y1 Gen2A|STR|treeya||"
+	["TREEYA360*"]="Lenovo 300e Gen 2 AST|STR|treeya||"
+	["TREEYA*"]="Lenovo 100e Gen 2 AST|STR|||"
 
 	# PCO devices - AMD Picasso
 	["BERKNIP*"]="HP Chromebook 14b|PCO|||"
@@ -494,14 +506,11 @@ DEVICE_DB=(
 	["GUMBOZ*"]="HP Chromebook x360 14a-cb0|PCO|||"
 	["JELBOZ360*"]="ASUS Chromebook Flip CM1 (CM1400)|PCO|||"
 	["MORPHIUS*"]="Lenovo ThinkPad C13 Yoga Chromebook|PCO|||"
-	["VILBOZ14*"]="Lenovo 14e Chromebook Gen 2|PCO|vilboz||"
-	["VILBOZ360-YQWT*"]="NEC Chromebook Y1 Gen3A|PCO|vilboz||"
-	["VILBOZ360-ZHKO*"]="Lenovo 300e Chromebook Gen 3|PCO|vilboz||"
-	["VILBOZ*"]="Lenovo 100e Chromebook Gen 3|PCO|||"
+	["VILBOZ*"]="Lenovo 100e or 14e Chromebook / NEC Chromebook Y1|PCO|vilboz||"
 	["WOOMAX*"]="ASUS Chromebook Flip CM5|PCO|||"
 
 	# CZN devices - AMD Cezanne
-	["DEWATT[*"]="Acer Chromebook Spin 514 [CP514-3H]|CZN|||"
+	["DEWATT*"]="Acer Chromebook Spin 514 [CP514-3H]|CZN|||"
 	["NIPPERKIN*"]="HP Elite c645 G2 Chromebook|CZN|||"
 
 	# MDN devices - AMD Mendocino