diff --git a/src/utils.sh b/src/utils.sh index 70ff6ca..b3e85d0 100644 --- a/src/utils.sh +++ b/src/utils.sh @@ -123,34 +123,21 @@ cpu() { fi cpu="${cpu// CPU/}" - cpu="${cpu// 4 Core/}" - cpu="${cpu// 6 Core/}" - cpu="${cpu// 8 Core/}" - cpu="${cpu// 10 Core/}" - cpu="${cpu// 12 Core/}" - cpu="${cpu// 16 Core/}" - cpu="${cpu// 32 Core/}" - cpu="${cpu// 48 Core/}" - cpu="${cpu// 64 Core/}" - cpu="${cpu// 96 Core/}" - cpu="${cpu// 128 Core/}" - cpu="${cpu//7th Gen /}" - cpu="${cpu//8th Gen /}" - cpu="${cpu//9th Gen /}" - cpu="${cpu//10th Gen /}" - cpu="${cpu//11th Gen /}" - cpu="${cpu//12th Gen /}" - cpu="${cpu//13th Gen /}" - cpu="${cpu//14th Gen /}" - cpu="${cpu//15th Gen /}" + cpu="${cpu// [0-9] Core}" + cpu="${cpu// [0-9][0-9] Core}" + cpu="${cpu// [0-9][0-9][0-9] Core}" + cpu="${cpu// [0-9]th Gen}" + cpu="${cpu// [0-9][0-9]th Gen}" cpu="${cpu// Processor/}" cpu="${cpu// Quad core/}" cpu="${cpu// Dual core/}" cpu="${cpu// Octa core/}" + cpu="${cpu// Hexa core/}" cpu="${cpu// Core TM/ Core}" cpu="${cpu// with Radeon Graphics/}" cpu="${cpu// with Radeon Vega Graphics/}" cpu="${cpu// with Radeon Vega Mobile Gfx/}" + cpu="${cpu// w Radeon [0-9][0-9][0-9]M Graphics/}" [ -z "${cpu// /}" ] && cpu="Unknown"