dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2025-01-19 08:57:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

prerelease cleanups

Browse source
This commit is contained in:
Harald Hope 2023-09-25 15:07:20 -07:00
parent 37ccecff3b
commit 203f14c77d
2 changed files with 48 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
pinxi
View file

@ -50,7 +50,7 @@ use POSIX qw(ceil uname strftime ttyname);
## INXI INFO ## ## INXI INFO ##
my $self_name='pinxi'; my $self_name='pinxi';
my $self_version='3.3.29'; my $self_version='3.3.29';
my $self_date='2023-09-18'; my $self_date='2023-09-25';
my $self_patch='27'; my $self_patch='27';
## END INXI INFO ## ## END INXI INFO ##
@ -14185,18 +14185,19 @@ sub set_disk_vendors {
['(^MKN|Mushkin)','Mushkin','Mushkin',''], # MKNS ['(^MKN|Mushkin)','Mushkin','Mushkin',''], # MKNS
# MU = Multiple_Flash_Reader too risky: |M[UZ][^L] HD103SI HD start risky # MU = Multiple_Flash_Reader too risky: |M[UZ][^L] HD103SI HD start risky
# HM320II HM320II HM # HM320II HM320II HM
['(SAMSUNG|^(AWMB|[BC]DS20|[BC]WB|BJ[NT]|[BC]GND|CJ[NT]|CUT|[DG]3 Station|DUO\b|DUT|CKT|[GS]2 Portable|GN|HD\d{3}[A-Z]{2}$|(HM|SP)\d{2}|HS\d|M[AB]G\d[FG]|MCC|MCBOE|MCG\d+GC|[CD]JN|MZ|^G[CD][1-9][QS]|P[BM]\d|(SSD\s?)?SM\s?841)|^SSD\s?[89]\d{2}\s(DCT|PRO|QVD|\d+[GT]B)|\bEVO\b|SV\d|[BE][A-Z][1-9]QT|YP\b|[CH]N-M|MMC[QR]E)','SAMSUNG','Samsung',''], # maybe ^SM, ^HM ['(SAMSUNG|^(AWMB|[BC]DS20|[BC]WB|BJ[NT]|[BC]GND|CJ[NT]|CKT|CUT|[DG]3 Station|DUO\b|DUT|EB\dMW|GE4S5|[GS]2 Portable|GN|HD\d{3}[A-Z]{2}$|(HM|SP)\d{2}|HS\d|M[AB]G\d[FG]|MCC|MCBOE|MCG\d+GC|[CD]JN|MZ|^G[CD][1-9][QS]|P[BM]\d|(SSD\s?)?SM\s?841)|^SSD\s?[89]\d{2}\s(DCT|PRO|QVD|\d+[GT]B)|\bEVO\b|SV\d|[BE][A-Z][1-9]QT|YP\b|[CH]N-M|MMC[QR]E)','SAMSUNG','Samsung',''], # maybe ^SM, ^HM
# Android UMS Composite?U1 # Android UMS Composite?U1
['(SanDisk|0781|^(A[BCD]LC[DE]|AFGCE|D[AB]4|DX[1-9]|Extreme|Firebird|S[CD]\d{2}G|SD(S[S]?[ADQ]|SL\d+G|SU\d|\sUltra)|SDW[1-9]|SE\d{2}|SEM[1-9]|\d[STU]|U(3\b|1\d0))|Clip Sport|Cruzer|iXpand|SSD (Plus|U1[01]0) [1-9]|ULTRA\s(FIT|trek|II)|X[1-6]\d{2})','(SanDisk|0781)','SanDisk',''], ['(SanDisk|0781|^(A[BCD]LC[DE]|AFGCE|D[AB]4|DX[1-9]|Extreme|Firebird|S[CD]\d{2}G|SD(S[S]?[ADQ]|SL\d+G|SU\d|\sUltra)|SDW[1-9]|SE\d{2}|SEM[1-9]|\d[STU]|U(3\b|1\d0))|Clip Sport|Cruzer|iXpand|SN(\d+G|128|256)|SSD (Plus|U1[01]0) [1-9]|ULTRA\s(FIT|trek|II)|X[1-6]\d{2})','(SanDisk|0781)','SanDisk',''],
# these are HP/Sandisk cobranded. DX110064A5xnNMRI ids as HP and Sandisc # these are HP/Sandisk cobranded. DX110064A5xnNMRI ids as HP and Sandisc
['(^DX[1-9])','^(HP\b|SANDDISK)','Sandisk/HP',''], # ssd drive, must come before seagate ST test ['(^DX[1-9])','^(HP\b|SANDDISK)','Sandisk/HP',''], # ssd drive, must come before seagate ST test
# real, SSEAGATE Backup+; XP1600HE30002 | 024 HN (spinpoint) ; possible usb: 24AS # real, SSEAGATE Backup+; XP1600HE30002 | 024 HN (spinpoint) ; possible usb: 24AS
# ST[numbers] excludes other ST starting devices # ST[numbers] excludes other ST starting devices
['([S]?SEAGATE|^((Barra|Fire)Cuda|BUP|EM\d{3}|Expansion|(ATA\s|HDD\s)?ST\d{2}|5AS|X[AFP])|Backup(\+|\s?Plus)\s?(Hub)?|DS2\d|Expansion Desk|FreeAgent|GoFlex|INIC|IronWolf|OneTouch|Slim\s?BK)','[S]?SEAGATE','Seagate',''], ['([S]?SEAGATE|^((Barra|Fire)Cuda|BUP|EM\d{3}|Expansion|(ATA\s|HDD\s)?ST\d{2}|5AS|X[AFP])|Backup(\+|\s?Plus)\s?(Hub)?|DS2\d|Expansion Desk|FreeAgent|GoFlex|INIC|IronWolf|OneTouch|Slim\s?BK)','[S]?SEAGATE','Seagate',''],
['^(WD|WL[0]9]|Western Digital|My (Book|Passport)|\d*LPCX|Elements|easystore|EA[A-Z]S|EARX|EFRX|EZRX|\d*EAVS|G[\s-]Drive|i HTS|0JD|JP[CV]|MD0|M000|\d+(BEV|(00)?AAK|AAV|AZL|EA[CD]S)|PC\sSN|SPZX|3200[AB]|2500[BJ]|20G2|5000[AB]|6400[AB]|7500[AB]|00[ABL][A-Z]{2}|SSC\b)','(^WDC|Western\s?Digital)','Western Digital',''], ['^(WD|WL[0]9]|Western Digital|My (Book|Passport)|\d*LPCX|Elements|easystore|EA[A-Z]S|EARX|EFRX|EZRX|\d*EAVS|G[\s-]Drive|i HTS|0JD|JP[CV]|MD0|M000|\d+(BEV|(00)?AAK|AAV|AZL|EA[CD]S)|PC\sSN|SN530|SPZX|3200[AB]|2500[BJ]|20G2|5000[AB]|6400[AB]|7500[AB]|00[ABL][A-Z]{2}|SSC\b)','(^WDC|Western\s?Digital)','Western Digital',''],
# rare cases WDC is in middle of string # rare cases WDC is in middle of string
['(\bWDC\b|1002FAEX)','','Western Digital',''], ['(\bWDC\b|1002FAEX)','','Western Digital',''],
## THEN BETTER KNOWN ONESs ##
## THEN BETTER KNOWN ONES ##
['^Acer','^Acer','Acer',''], ['^Acer','^Acer','Acer',''],
# A-Data can be in middle of string # A-Data can be in middle of string
['^(.*\bA-?DATA|ASP\d|AX[MN]|CH11|FX63|HV[1-9]|IM2|HD[1-9]|HDD\s?CH|IUM|SX\d|Swordfish)','A-?DATA','A-Data',''], ['^(.*\bA-?DATA|ASP\d|AX[MN]|CH11|FX63|HV[1-9]|IM2|HD[1-9]|HDD\s?CH|IUM|SX\d|Swordfish)','A-?DATA','A-Data',''],
@ -14205,7 +14206,7 @@ sub set_disk_vendors {
['^ATP','^ATP\b','ATP',''], ['^ATP','^ATP\b','ATP',''],
# Force MP500 # Force MP500
['^(Corsair|Force\s|(Flash\s*)?(Survivor|Voyager)|Neutron|Padlock)','^Corsair','Corsair',''], ['^(Corsair|Force\s|(Flash\s*)?(Survivor|Voyager)|Neutron|Padlock)','^Corsair','Corsair',''],
['^(FUJITSU|MJA|MH[TVWYZ]\d|MP|MAP\d|F\d00s?-)','^FUJITSU','Fujitsu',''], ['^(FUJITSU|MJA|MH[RTVWYZ]\d|MP|MAP\d|F\d00s?-)','^FUJITSU','Fujitsu',''],
# MAB3045SP shows as HP or Fujitsu, probably HP branded fujitsu # MAB3045SP shows as HP or Fujitsu, probably HP branded fujitsu
['^(MAB\d)','^(HP\b|FUJITSU)','Fujitsu/HP',''], ['^(MAB\d)','^(HP\b|FUJITSU)','Fujitsu/HP',''],
# note: 2012: wdc bought hgst # note: 2012: wdc bought hgst
@ -14228,6 +14229,7 @@ sub set_disk_vendors {
# note: get rid of: M[DGK] becasue mushkin starts with MK # note: get rid of: M[DGK] becasue mushkin starts with MK
# note: seen: KXG50ZNV512G NVMe TOSHIBA 512GB | THNSN51T02DUK NVMe TOSHIBA 1024GB # note: seen: KXG50ZNV512G NVMe TOSHIBA 512GB | THNSN51T02DUK NVMe TOSHIBA 1024GB
['(TOSHIBA|TransMemory|KBG4|^((A\s)?DT01A|M[GKQ]\d|HDW|SA\d{2}G$|(008|016|032|064|128)G[379E][0-9A]$|[S]?TOS|THN)|0930|KSG\d)','S?(TOSHIBA|0930)','Toshiba',''], # scsi-STOSHIBA_STOR.E_EDITION_ ['(TOSHIBA|TransMemory|KBG4|^((A\s)?DT01A|M[GKQ]\d|HDW|SA\d{2}G$|(008|016|032|064|128)G[379E][0-9A]$|[S]?TOS|THN)|0930|KSG\d)','S?(TOSHIBA|0930)','Toshiba',''], # scsi-STOSHIBA_STOR.E_EDITION_
## LAST: THEY ARE SHORT AND COULD LEAD TO FALSE ID, OR ARE UNLIKELY ## ## LAST: THEY ARE SHORT AND COULD LEAD TO FALSE ID, OR ARE UNLIKELY ##
# unknown: AL25744_12345678; ADP may be usb 2.5" adapter; udisk unknown: Z1E6FTKJ 00AAKS # unknown: AL25744_12345678; ADP may be usb 2.5" adapter; udisk unknown: Z1E6FTKJ 00AAKS
# SSD2SC240G726A10 MRS020A128GTS25C EHSAJM0016GB # SSD2SC240G726A10 MRS020A128GTS25C EHSAJM0016GB
@ -14246,12 +14248,15 @@ sub set_disk_vendors {
['^(Advantech|SQF)','^Advantech','Advantech',''], ['^(Advantech|SQF)','^Advantech','Advantech',''],
['^AEGO','^AEGO','AEGO',''], ['^AEGO','^AEGO','AEGO',''],
['^AFOX','^AFOX','AFOX',''], ['^AFOX','^AFOX','AFOX',''],
['^AFTERSHOCK','^AFTERSHOCK','AFTERSHOCK',''],
['^(Agile|AGI)','^(AGI|Agile\s?Gear\s?Int[a-z]*)','AGI',''], ['^(Agile|AGI)','^(AGI|Agile\s?Gear\s?Int[a-z]*)','AGI',''],
['^Aigo','^Aigo','Aigo',''], ['^Aigo','^Aigo','Aigo',''],
['^AirDisk','^AirDisk','AirDisk',''],
['^Aireye','^Aireye','Aireye',''], ['^Aireye','^Aireye','Aireye',''],
['^Alcatel','^Alcatel','Alcatel',''], ['^Alcatel','^Alcatel','Alcatel',''],
['^(Alcor(\s?Micro)?|058F)','^(Alcor(\s?Micro)?|058F)','Alcor Micro',''], ['^(Alcor(\s?Micro)?|058F)','^(Alcor(\s?Micro)?|058F)','Alcor Micro',''],
['^Alfawise','^Alfawise','Alfawise',''], ['^Alfawise','^Alfawise','Alfawise',''],
['(^ALKETRON|FireWizard)','^ALKETRON','ALKETRON',''],
['^Android','^Android','Android',''], ['^Android','^Android','Android',''],
['^ANACOMDA','^ANACOMDA','ANACOMDA',''], ['^ANACOMDA','^ANACOMDA','ANACOMDA',''],
['^Ant[\s_-]?Esports','^Ant[\s_-]?Esports','Ant Esports',''], ['^Ant[\s_-]?Esports','^Ant[\s_-]?Esports','Ant Esports',''],
@ -14298,12 +14303,14 @@ sub set_disk_vendors {
['^Clover','^Clover','Clover',''], ['^Clover','^Clover','Clover',''],
['^CODi','^CODi','CODi',''], ['^CODi','^CODi','CODi',''],
['^Colorful\b','^Colorful','Colorful',''], ['^Colorful\b','^Colorful','Colorful',''],
['^CONSISTENT','^CONSISTENT','Consistent',''],
# note: www.cornbuy.com is both a brand and also sells other brands, like newegg # note: www.cornbuy.com is both a brand and also sells other brands, like newegg
# addlink; colorful; goldenfir; kodkak; maxson; netac; teclast; vaseky # addlink; colorful; goldenfir; kodkak; maxson; netac; teclast; vaseky
['^Corn','^Corn','Corn',''], ['^Corn','^Corn','Corn',''],
['^CnMemory|Spaceloop','^CnMemory','CnMemory',''], ['^CnMemory|Spaceloop','^CnMemory','CnMemory',''],
['^(Creative|(Nomad\s?)?MuVo)','^Creative','Creative',''], ['^(Creative|(Nomad\s?)?MuVo)','^Creative','Creative',''],
['^CSD','^CSD','CSD',''], ['^CSD','^CSD','CSD',''],
['^CYX\b','^CYX','CYX',''],
['^(Dane-?Elec|Z Mate)','^Dane-?Elec','DaneElec',''], ['^(Dane-?Elec|Z Mate)','^Dane-?Elec','DaneElec',''],
['^DATABAR','^DATABAR','DataBar',''], ['^DATABAR','^DATABAR','DataBar',''],
# Daplink vfs is an ARM software thing # Daplink vfs is an ARM software thing
@ -14315,6 +14322,7 @@ sub set_disk_vendors {
['^DeLOCK','^Delock(\s?products)?','Delock',''], ['^DeLOCK','^Delock(\s?products)?','Delock',''],
['^Derler','^Derler','Derler',''], ['^Derler','^Derler','Derler',''],
['^detech','^detech','DETech',''], ['^detech','^detech','DETech',''],
['^DEXP','^DEXP','DEXP',''],
['^DGM','^DGM\b','DGM',''], ['^DGM','^DGM\b','DGM',''],
['^(DICOM|MAESTRO)','^DICOM','DICOM',''], ['^(DICOM|MAESTRO)','^DICOM','DICOM',''],
['^Digifast','^Digifast','Digifast',''], ['^Digifast','^Digifast','Digifast',''],
@ -14348,8 +14356,11 @@ sub set_disk_vendors {
['^(Shenzhen\s)?Etopso(\sTechnology)?','^(Shenzhen\s)?Etopso(\sTechnology)?','Etopso',''], ['^(Shenzhen\s)?Etopso(\sTechnology)?','^(Shenzhen\s)?Etopso(\sTechnology)?','Etopso',''],
['^EURS','^EURS','EURS',''], ['^EURS','^EURS','EURS',''],
['^eVAULT','^eVAULT','eVAULT',''], ['^eVAULT','^eVAULT','eVAULT',''],
['^EVM','^EVM','EVM',''],
['^eVtran','^eVtran','eVtran',''],
# NOTE: ESA3... may be IBM PCIe SAD card/drives # NOTE: ESA3... may be IBM PCIe SAD card/drives
['^(EXCELSTOR|r technology)','^EXCELSTOR( TECHNO(LOGY)?)?','ExcelStor',''], ['^(EXCELSTOR|r technology)','^EXCELSTOR( TECHNO(LOGY)?)?','ExcelStor',''],
['^EXRAM','^EXRAM','EXRAM',''],
['^EYOTA','^EYOTA','EYOTA',''], ['^EYOTA','^EYOTA','EYOTA',''],
['^EZCOOL','^EZCOOL','EZCOOL',''], ['^EZCOOL','^EZCOOL','EZCOOL',''],
['^EZLINK','^EZLINK','EZLINK',''], ['^EZLINK','^EZLINK','EZLINK',''],
@ -14382,6 +14393,7 @@ sub set_disk_vendors {
['^(Gigabyte|GP-G)','^Gigabyte','Gigabyte',''], # SSD ['^(Gigabyte|GP-G)','^Gigabyte','Gigabyte',''], # SSD
['^Gigastone','^Gigastone','Gigastone',''], ['^Gigastone','^Gigastone','Gigastone',''],
['^Gigaware','^Gigaware','Gigaware',''], ['^Gigaware','^Gigaware','Gigaware',''],
['^GJN','^GJN\b','GJN',''],
['^(Gloway|FER\d)','^Gloway','Gloway',''], ['^(Gloway|FER\d)','^Gloway','Gloway',''],
['^GLOWY','^GLOWY','Glowy',''], ['^GLOWY','^GLOWY','Glowy',''],
['^Goldendisk','^Goldendisk','Goldendisk',''], ['^Goldendisk','^Goldendisk','Goldendisk',''],
@ -14408,6 +14420,7 @@ sub set_disk_vendors {
['^HEMA','^HEMA','HEMA',''], ['^HEMA','^HEMA','HEMA',''],
['(HEORIADY|^HX-0)','^HEORIADY','HEORIADY',''], ['(HEORIADY|^HX-0)','^HEORIADY','HEORIADY',''],
['^(Hikvision|HKVSN|HS-SSD)','^Hikvision','Hikvision',''], ['^(Hikvision|HKVSN|HS-SSD)','^Hikvision','Hikvision',''],
['^Hi[\s-]?Level ','^Hi[\s-]?Level ','Hi-Level',''], # ^HI\b with no Level?
['^(Hisense|H8G)','^Hisense','Hisense',''], ['^(Hisense|H8G)','^Hisense','Hisense',''],
['^Hoodisk','^Hoodisk','Hoodisk',''], ['^Hoodisk','^Hoodisk','Hoodisk',''],
['^HUAWEI','^HUAWEI','Huawei',''], ['^HUAWEI','^HUAWEI','Huawei',''],
@ -14458,6 +14471,7 @@ sub set_disk_vendors {
['^KimMIDI','^KimMIDI','KimMIDI',''], ['^KimMIDI','^KimMIDI','KimMIDI',''],
['^Kimtigo','^Kimtigo','Kimtigo',''], ['^Kimtigo','^Kimtigo','Kimtigo',''],
['^Kingbank','^Kingbank','Kingbank',''], ['^Kingbank','^Kingbank','Kingbank',''],
['^(KingCell|KC\b)','^KingCell','KingCell',''],
['^Kingchux[\s-]?ing','^Kingchux[\s-]?ing','Kingchuxing',''], ['^Kingchux[\s-]?ing','^Kingchux[\s-]?ing','Kingchuxing',''],
['^KINGCOMP','^KINGCOMP','KingComp',''], ['^KINGCOMP','^KINGCOMP','KingComp',''],
['(KingDian|^NGF|S(280|400))','KingDian','KingDian',''], ['(KingDian|^NGF|S(280|400))','KingDian','KingDian',''],
@ -14466,7 +14480,7 @@ sub set_disk_vendors {
['^Kingrich','^Kingrich','Kingrich',''], ['^Kingrich','^Kingrich','Kingrich',''],
['^Kingsand','^Kingsand','Kingsand',''], ['^Kingsand','^Kingsand','Kingsand',''],
['KING\s?SHA\s?RE','KING\s?SHA\s?RE','KingShare',''], ['KING\s?SHA\s?RE','KING\s?SHA\s?RE','KingShare',''],
['^(KingSpec|ACSC|C3000|KS[DQ]|N[ET]-\d|P3$|P4\b|PA[_-]?(18|25)|Q-180|T-(3260|64|128)|Z(\d\s|F\d))','^KingSpec','KingSpec',''], ['^(KingSpec|ACSC|C3000|KS[DQ]|MSH|N[ET]-\d|P3$|P4\b|PA[_-]?(18|25)|Q-180|T-(3260|64|128)|Z(\d\s|F\d))','^KingSpec','KingSpec',''],
['^KingSSD','^KingSSD','KingSSD',''], ['^KingSSD','^KingSSD','KingSSD',''],
# kingwin docking, not actual drive # kingwin docking, not actual drive
['^(EZD|EZ-Dock)','','Kingwin Docking Station',''], ['^(EZD|EZ-Dock)','','Kingwin Docking Station',''],
@ -14487,7 +14501,7 @@ sub set_disk_vendors {
['^(Lazos|L-?ISS)','^Lazos','Lazos',''], ['^(Lazos|L-?ISS)','^Lazos','Lazos',''],
['^LDLC','^LDLC','LDLC',''], ['^LDLC','^LDLC','LDLC',''],
# LENSE30512GMSP34MEAT3TA / UMIS RPITJ256PED2MWX # LENSE30512GMSP34MEAT3TA / UMIS RPITJ256PED2MWX
['^(LEN|UMIS)','^Lenovo','Lenovo',''], ['^(LEN|UMIS|Think)','^Lenovo','Lenovo',''],
['^RPFT','','Lenovo O.E.M.',''], ['^RPFT','','Lenovo O.E.M.',''],
# JAJS300M120C JAJM600M256C JAJS600M1024C JAJS600M256C JAJMS600M128G # JAJS300M120C JAJM600M256C JAJS600M1024C JAJS600M256C JAJMS600M128G
['^(Leven|JAJ[MS])','^Leven','Leven',''], ['^(Leven|JAJ[MS])','^Leven','Leven',''],
@ -14502,13 +14516,13 @@ sub set_disk_vendors {
['^(LSI|MegaRAID)','^LSI\b','LSI',''], ['^(LSI|MegaRAID)','^LSI\b','LSI',''],
['^(M-Systems|DiskOnKey)','^M-Systems','M-Systems',''], ['^(M-Systems|DiskOnKey)','^M-Systems','M-Systems',''],
['^(Mach\s*Xtreme|MXSSD|MXU|MX[\s-])','^Mach\s*Xtreme','Mach Xtreme',''], ['^(Mach\s*Xtreme|MXSSD|MXU|MX[\s-])','^Mach\s*Xtreme','Mach Xtreme',''],
['^(MacroVIP|MV\d)','^MacroVIP','MacroVIP',''], ['^(MacroVIP|MV(\d|GLD))','^MacroVIP','MacroVIP',''], # maybe MV alone
['^Mainic','^Mainic','Mainic',''], ['^Mainic','^Mainic','Mainic',''],
['^(MARSHAL\b|MAL\d)','^MARSHAL','Marshal',''],
['^Maxell','^Maxell','Maxell',''], ['^Maxell','^Maxell','Maxell',''],
['^Maximus','^Maximus','Maximus',''], ['^Maximus','^Maximus','Maximus',''],
['^MAXIO','^MAXIO','Maxio',''],
['^Maxone','^Maxone','Maxone',''], ['^Maxone','^Maxone','Maxone',''],
['^(Memorex|TravelDrive|TD\s?Classic)','^Memorex','Memorex',''],
['^(MARSHAL\b|MAL\d)','^MARSHAL','Marshal',''],
['^MARVELL','^MARVELL','Marvell',''], ['^MARVELL','^MARVELL','Marvell',''],
['^Maxsun','^Maxsun','Maxsun',''], ['^Maxsun','^Maxsun','Maxsun',''],
['^MDT\b','^MDT','MDT (rebuilt WD/Seagate)',''], # mdt rebuilds wd/seagate hdd ['^MDT\b','^MDT','MDT (rebuilt WD/Seagate)',''], # mdt rebuilds wd/seagate hdd
@ -14516,7 +14530,9 @@ sub set_disk_vendors {
['^MD[1-9]','^Max\s*Digital','MaxDigital',''], ['^MD[1-9]','^Max\s*Digital','MaxDigital',''],
['^Medion','^Medion','Medion',''], ['^Medion','^Medion','Medion',''],
['^(MEDIAMAX|WL\d{2})','^MEDIAMAX','MediaMax',''], ['^(MEDIAMAX|WL\d{2})','^MEDIAMAX','MediaMax',''],
['^(Memorex|TravelDrive|TD\s?Classic)','^Memorex','Memorex',''],
['^Mengmi','^Mengmi','Mengmi',''], ['^Mengmi','^Mengmi','Mengmi',''],
['^MicroFrom','^MicroFrom','MicroFrom',''],
['^MGTEC','^MGTEC','MGTEC',''], ['^MGTEC','^MGTEC','MGTEC',''],
# must come before micron # must come before micron
['^(Mtron|MSP)','^Mtron','Mtron',''], ['^(Mtron|MSP)','^Mtron','Mtron',''],
@ -14535,8 +14551,9 @@ sub set_disk_vendors {
['^Morebeck','^Morebeck','Morebeck',''], ['^Morebeck','^Morebeck','Morebeck',''],
['^(Moser\s?Bear|MBIL)','^Moser\s?Bear','Moser Bear',''], ['^(Moser\s?Bear|MBIL)','^Moser\s?Bear','Moser Bear',''],
['^(Motile|SSM\d)','^Motile','Motile',''], ['^(Motile|SSM\d)','^Motile','Motile',''],
['^(Motorola|XT\d{4})','^Motorola','Motorola',''], ['^(Motorola|XT\d{4}|Moto[\s-]?[EG])','^Motorola','Motorola',''],
['^Moweek','^Moweek','Moweek',''], ['^Moweek','^Moweek','Moweek',''],
['^Move[\s-]?Speed','^Move[\s-]?Speed','Move Speed',''],
#MRMAD4B128GC9M2C #MRMAD4B128GC9M2C
['^(MRMA|Memoright)','^Memoright','Memoright',''], ['^(MRMA|Memoright)','^Memoright','Memoright',''],
['^MSI\b','^MSI\b','MSI',''], ['^MSI\b','^MSI\b','MSI',''],
@ -14546,11 +14563,13 @@ sub set_disk_vendors {
['^(Myson)','^Myson([\s-]?Century)?([\s-]?Inc\.?)?','Myson Century',''], ['^(Myson)','^Myson([\s-]?Century)?([\s-]?Inc\.?)?','Myson Century',''],
['^(Natusun|i-flashdisk)','^Natusun','Natusun',''], ['^(Natusun|i-flashdisk)','^Natusun','Natusun',''],
['^(Neo\s*Forza|NFS\d)','^Neo\s*Forza','Neo Forza',''], ['^(Neo\s*Forza|NFS\d)','^Neo\s*Forza','Neo Forza',''],
['^(Netac|OnlyDisk|S535N)','^Netac','Netac',''], ['^(Netac|NS\d{3}|OnlyDisk|S535N)','^Netac','Netac',''],
['^Newsmy','^Newsmy','Newsmy',''],
['^NFHK','^NFHK','NFHK',''], ['^NFHK','^NFHK','NFHK',''],
# NGFF is a type, like msata, sata # NGFF is a type, like msata, sata
['^Nik','^Nikimi','Nikimi',''], ['^Nik','^Nikimi','Nikimi',''],
['^NOREL','^NOREL(SYS)?','NorelSys',''], ['^NOREL','^NOREL(SYS)?','NorelSys',''],
['^(N[\s-]?Tech|NT\d)','^N[\s-]?Tec','N Tech',''], # coudl be ^NT alone
['^ODYS','^ODYS','ODYS',''], ['^ODYS','^ODYS','ODYS',''],
['^Olympus','^Olympus','Olympus',''], ['^Olympus','^Olympus','Olympus',''],
['^Orico','^Orico','Orico',''], ['^Orico','^Orico','Orico',''],
@ -14574,15 +14593,17 @@ sub set_disk_vendors {
['^(Premiertek|QSSD|Quaroni)','^Premiertek','Premiertek',''], ['^(Premiertek|QSSD|Quaroni)','^Premiertek','Premiertek',''],
['^(-?Pretec|UltimateGuard)','-?Pretec','Pretec',''], ['^(-?Pretec|UltimateGuard)','-?Pretec','Pretec',''],
['^(Prolific)','^Prolific( Technolgy Inc\.)?','Prolific',''], ['^(Prolific)','^Prolific( Technolgy Inc\.)?','Prolific',''],
# PS3109S9 is the result of an error condition with ssd drive # PS3109S9 is the result of an error condition with ssd controller: Phison PS3109
['^PUSKILL','^PUSKILL','Puskill',''], ['^PUSKILL','^PUSKILL','Puskill',''],
['QEMU','^\d*QEMU( QEMU)?','QEMU',''], # 0QUEMU QEMU HARDDISK ['QEMU','^\d*QEMU( QEMU)?','QEMU',''], # 0QUEMU QEMU HARDDISK
['(^Quantum|Fireball)','^Quantum','Quantum',''], ['(^Quantum|Fireball)','^Quantum','Quantum',''],
['(^QOOTEC|QMT)','^QOOTEC','QOOTEC',''], ['(^QOOTEC|QMT)','^QOOTEC','QOOTEC',''],
['^QUMO','^QUMO','Qumo',''], ['^(QUMO|Q\dDT)','^QUMO','Qumo',''],
['^QOPP','^QOPP','Qopp',''],
['^Qunion','^Qunion','Qunion',''], ['^Qunion','^Qunion','Qunion',''],
['^(R[3-9]|AMD\s?(RADEON)?|Radeon)','AMD\s?(RADEON)?','AMD Radeon',''], # ssd ['^(R[3-9]|AMD\s?(RADEON)?|Radeon)','AMD\s?(RADEON)?','AMD Radeon',''], # ssd
['^(Ramaxel|RT|RM|RPF|RDM)','^Ramaxel','Ramaxel',''], ['^(Ramaxel|RT|RM|RPF|RDM)','^Ramaxel','Ramaxel',''],
['^RAMOS','^RAMOS','RAmos',''],
['^(Ramsta|R[1-9])','^Ramsta','Ramsta',''], ['^(Ramsta|R[1-9])','^Ramsta','Ramsta',''],
['^RCESSD','^RCESSD','RCESSD',''], ['^RCESSD','^RCESSD','RCESSD',''],
['^(Realtek|RTL)','^Realtek','Realtek',''], ['^(Realtek|RTL)','^Realtek','Realtek',''],
@ -14595,6 +14616,7 @@ sub set_disk_vendors {
#RTDMA008RAV2BWL comes with lenovo but don't know brand #RTDMA008RAV2BWL comes with lenovo but don't know brand
['^Runcore','^Runcore','Runcore',''], ['^Runcore','^Runcore','Runcore',''],
['^Rundisk','^Rundisk','RunDisk',''], ['^Rundisk','^Rundisk','RunDisk',''],
['^RZX','^RZX\b','RZX',''],
['^(S3Plus|S3\s?SSD)','^S3Plus','S3Plus',''], ['^(S3Plus|S3\s?SSD)','^S3Plus','S3Plus',''],
['^(Sabrent|Rocket)','^Sabrent','Sabrent',''], ['^(Sabrent|Rocket)','^Sabrent','Sabrent',''],
['^Sage','^Sage(\s?Micro)?','Sage Micro',''], ['^Sage','^Sage(\s?Micro)?','Sage Micro',''],
@ -14611,6 +14633,7 @@ sub set_disk_vendors {
['(Silicon[\s-]?Power|^SP[CP]C|^Silicon|^Diamond|^HasTopSunlightpeed)','Silicon[\s-]?Power','Silicon Power',''], ['(Silicon[\s-]?Power|^SP[CP]C|^Silicon|^Diamond|^HasTopSunlightpeed)','Silicon[\s-]?Power','Silicon Power',''],
# simple drive could also maybe be hgst # simple drive could also maybe be hgst
['^(Simple\s?Tech|Simple[\s-]?Drive)','^Simple\s?Tech','SimpleTech',''], ['^(Simple\s?Tech|Simple[\s-]?Drive)','^Simple\s?Tech','SimpleTech',''],
['^(Simmtronics?|S[79]\d{2}|ZipX)','^Simmtronics?','Simmtronics',''],
['^SINTECHI?','^SINTECHI?','SinTech (adapter)',''], ['^SINTECHI?','^SINTECHI?','SinTech (adapter)',''],
['^SiS\b','^SiS','SiS',''], ['^SiS\b','^SiS','SiS',''],
['Smartbuy','\s?Smartbuy','Smartbuy',''], # SSD Smartbuy 60GB; mSata Smartbuy 3 ['Smartbuy','\s?Smartbuy','Smartbuy',''], # SSD Smartbuy 60GB; mSata Smartbuy 3
@ -14621,9 +14644,11 @@ sub set_disk_vendors {
['^Skill','^Skill','Skill',''], ['^Skill','^Skill','Skill',''],
['^(SMART( Storage Systems)?|TX)','^(SMART( Storage Systems)?)','Smart Storage Systems',''], ['^(SMART( Storage Systems)?|TX)','^(SMART( Storage Systems)?)','Smart Storage Systems',''],
['^Sobetter','^Sobetter','Sobetter',''], ['^Sobetter','^Sobetter','Sobetter',''],
['^Solidata','^Solidata','Solidata',''],
['^(SOLIDIGM|SSDPFK)','^SOLIDIGM\b','solidgm',''], ['^(SOLIDIGM|SSDPFK)','^SOLIDIGM\b','solidgm',''],
['^(Sony|IM9|Microvalut|S[FR]-)','^Sony','Sony',''], ['^(Sony|IM9|Microvalut|S[FR]-)','^Sony','Sony',''],
['^(SSSTC|CL1-)','^SSSTC','SSSTC',''], ['^(SSSTC|CL1-)','^SSSTC','SSSTC',''],
['^(SST|SG[AN])','^SST\b','SST',''],
['^STE[CK]','^STE[CK]','sTec',''], # wd bought this one ['^STE[CK]','^STE[CK]','sTec',''], # wd bought this one
['^STORFLY','^STORFLY','StorFly',''], ['^STORFLY','^STORFLY','StorFly',''],
['\dSUN\d','^SUN(\sMicrosystems)?','Sun Microsystems',''], ['\dSUN\d','^SUN(\sMicrosystems)?','Sun Microsystems',''],
@ -14645,7 +14670,7 @@ sub set_disk_vendors {
['^(TC[\s-]*SUNBOW|X3\s\d+[GT])','^TC[\s-]*SUNBOW','TCSunBow',''], ['^(TC[\s-]*SUNBOW|X3\s\d+[GT])','^TC[\s-]*SUNBOW','TCSunBow',''],
['^(TDK|TF[1-9]\d|LoR)','^TDK','TDK',''], ['^(TDK|TF[1-9]\d|LoR)','^TDK','TDK',''],
['^TEAC','^TEAC','TEAC',''], ['^TEAC','^TEAC','TEAC',''],
['^(TEAM|T[\s-]?Create|L\d\s?Lite|T\d{3,}[A-Z]|TM\d|(Dark\s?)?L3\b|T[\s-]?Force)','^TEAM(\s*Group)?','TeamGroup',''], ['^(TEAM|T[\s-]?Create|CX[12]\b|L\d\s?Lite|T\d{3,}[A-Z]|TM\d|(Dark\s?)?L3\b|T[\s-]?Force)','^TEAM(\s*Group)?','TeamGroup',''],
['^(Teclast|CoolFlash)','^Teclast','Teclast',''], ['^(Teclast|CoolFlash)','^Teclast','Teclast',''],
['^(tecmiyo)','^tecmiyo','TECMIYO',''], ['^(tecmiyo)','^tecmiyo','TECMIYO',''],
['^Teelkoou','^Teelkoou','Teelkoou',''], ['^Teelkoou','^Teelkoou','Teelkoou',''],
@ -14693,7 +14718,7 @@ sub set_disk_vendors {
['^Walton','^Walton','Walton',''], ['^Walton','^Walton','Walton',''],
['^(Wearable|Air-?Stash)','^Wearable','Wearable',''], ['^(Wearable|Air-?Stash)','^Wearable','Wearable',''],
['^Wellcomm','^Wellcomm','Wellcomm',''], ['^Wellcomm','^Wellcomm','Wellcomm',''],
['^(wicgtyp|N900)','^wicgtyp','wicgtyp',''], ['^(wicgtyp|N[V]?900)','^wicgtyp','wicgtyp',''],
['^Wilk','^Wilk','Wilk',''], ['^Wilk','^Wilk','Wilk',''],
['^(WinMemory|SWG\d)','^WinMemory','WinMemory',''], ['^(WinMemory|SWG\d)','^WinMemory','WinMemory',''],
['^(Winton|WT\d{2})','^Winton','Winton',''], ['^(Winton|WT\d{2})','^Winton','Winton',''],
@ -14720,6 +14745,7 @@ sub set_disk_vendors {
['^Zenfast','^Zenfast','Zenfast',''], ['^Zenfast','^Zenfast','Zenfast',''],
['^Zenith','^Zenith','Zenith',''], ['^Zenith','^Zenith','Zenith',''],
['^ZEUSLAP','^ZEUSLAP','ZEUSLAP',''], ['^ZEUSLAP','^ZEUSLAP','ZEUSLAP',''],
['^ZEUSS','^ZEUSS','Zeuss',''],
['^(Zheino|CHN|CNM)','^Zheino','Zheino',''], ['^(Zheino|CHN|CNM)','^Zheino','Zheino',''],
['^(Zotac|ZTSSD)','^Zotac','Zotac',''], ['^(Zotac|ZTSSD)','^Zotac','Zotac',''],
['^ZSPEED','^ZSPEED','ZSpeed',''], ['^ZSPEED','^ZSPEED','ZSpeed',''],
@ -24420,6 +24446,7 @@ sub speed_mapper {
return ($speeds{$type}) ? $speeds{$type} . ' MT/s' : $type; return ($speeds{$type}) ? $speeds{$type} . ' MT/s' : $type;
} }
## START RAM VENDOR ## ## START RAM VENDOR ##
sub set_ram_vendors { sub set_ram_vendors {
$vendors = [ $vendors = [
@ -24440,6 +24467,7 @@ sub set_ram_vendors {
['^(G[A-Z]|Geil)','Geil','Geil',''], ['^(G[A-Z]|Geil)','Geil','Geil',''],
# Note: FA- but make loose FA # Note: FA- but make loose FA
['^(F4|G[\s\.-]?Skill)','G[\s\.-]?Skill','G.Skill',''], ['^(F4|G[\s\.-]?Skill)','G[\s\.-]?Skill','G.Skill',''],
['^(GJN)','GJN','GJN',''],
['^(HP)','','HP',''], # no IDs found ['^(HP)','','HP',''], # no IDs found
['^(HX|HyperX)','HyperX','HyperX',''], ['^(HX|HyperX)','HyperX','HyperX',''],
# Qimonda spun out of Infineon, same ids # Qimonda spun out of Infineon, same ids
@ -24456,9 +24484,11 @@ sub set_ram_vendors {
# Before patriot just in case # Before patriot just in case
['^(MN\d|PNY)','PNY\s','PNY',''], ['^(MN\d|PNY)','PNY\s','PNY',''],
['^(P[A-Z]|Patriot)','Patriot','Patriot',''], ['^(P[A-Z]|Patriot)','Patriot','Patriot',''],
['^RAMOS','^RAMOS','RAmos',''],
['^(K[1-6][ABLT]|K\d|M[\d]{3}[A-Z]|Samsung)','Samsung','Samsung',''], ['^(K[1-6][ABLT]|K\d|M[\d]{3}[A-Z]|Samsung)','Samsung','Samsung',''],
['^(SP|Silicon[\s-]?Power)','Silicon[\s-]?Power','Silicon Power',''], ['^(SP|Silicon[\s-]?Power)','Silicon[\s-]?Power','Silicon Power',''],
['^(STK|Simtek)','Simtek','Simtek',''], ['^(STK|Simtek)','Simtek','Simtek',''],
['^(Simmtronics|Gamex)','^Simmtronics','Simmtronics',''],
['^(HM[ACT]|SK[\s-]?Hynix)','SK[\s-]?Hynix','SK-Hynix',''], ['^(HM[ACT]|SK[\s-]?Hynix)','SK[\s-]?Hynix','SK-Hynix',''],
# TED TTZD TLRD TDZAD TF4D4 TPD4 TXKD4 seen: HMT but could by skh # TED TTZD TLRD TDZAD TF4D4 TPD4 TXKD4 seen: HMT but could by skh
#['^(T(ED|D[PZ]|F\d|LZ|P[DR]T[CZ]|XK)|Team[\s-]?Group)','Team[\s-]?Group','TeamGroup',''], #['^(T(ED|D[PZ]|F\d|LZ|P[DR]T[CZ]|XK)|Team[\s-]?Group)','Team[\s-]?Group','TeamGroup',''],

2
pinxi.1
View file

@ -15,7 +15,7 @@
.\" with this program; if not, write to the Free Software Foundation, Inc., .\" with this program; if not, write to the Free Software Foundation, Inc.,
.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. .\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
.\" .\"
.TH INXI 1 "2023\-09\-24" "inxi" "inxi manual" .TH INXI 1 "2023\-09\-25" "inxi" "inxi manual"
.SH NAME .SH NAME
inxi \- Command line system information script for console and IRC inxi \- Command line system information script for console and IRC