From 3b75791581cd8b2272461279feb240c006e6dbcc Mon Sep 17 00:00:00 2001 From: Daniel Lavrushin Date: Sun, 28 Jun 2026 01:47:57 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20update=20regex=20for=20CPU=20architectur?= =?UTF-8?q?e=20detection=20in=20install=20scripts=20=D0=A3=D1=81=D1=82?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BD=D0=B0=20keenetic?= =?UTF-8?q?=20(#265)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #260 --- install.sh | 6 +++--- installer/lib/utils.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index d6920667..25ea4983 100755 --- a/install.sh +++ b/install.sh @@ -214,7 +214,7 @@ detect_architecture() { armv7 | armv7l) if [ -f /proc/cpuinfo ] && grep -qE "(vfpv[3-9])" /proc/cpuinfo 2>/dev/null && - grep -qE "CPU architecture:\s*7" /proc/cpuinfo 2>/dev/null; then + grep -qE "CPU architecture:[[:space:]]*7" /proc/cpuinfo 2>/dev/null; then echo "armv7" else echo "armv5" @@ -224,9 +224,9 @@ detect_architecture() { armv5*) echo "armv5" ;; arm*) if [ -f /proc/cpuinfo ]; then - if grep -qE "CPU architecture:\s*7" /proc/cpuinfo 2>/dev/null; then + if grep -qE "CPU architecture:[[:space:]]*7" /proc/cpuinfo 2>/dev/null; then echo "armv7" - elif grep -qE "CPU architecture:\s*6" /proc/cpuinfo 2>/dev/null; then + elif grep -qE "CPU architecture:[[:space:]]*6" /proc/cpuinfo 2>/dev/null; then echo "armv6" else echo "armv5" diff --git a/installer/lib/utils.sh b/installer/lib/utils.sh index 4fb0c8c5..a326269d 100644 --- a/installer/lib/utils.sh +++ b/installer/lib/utils.sh @@ -156,7 +156,7 @@ detect_architecture() { # Check for full ARMv7 VFP support, otherwise use armv5 for safety if [ -f /proc/cpuinfo ] && grep -qE "(vfpv[3-9])" /proc/cpuinfo 2>/dev/null && - grep -qE "CPU architecture:\s*7" /proc/cpuinfo 2>/dev/null; then + grep -qE "CPU architecture:[[:space:]]*7" /proc/cpuinfo 2>/dev/null; then echo "armv7" else echo "armv5" @@ -166,9 +166,9 @@ detect_architecture() { armv5*) echo "armv5" ;; arm*) if [ -f /proc/cpuinfo ]; then - if grep -qE "CPU architecture:\s*7" /proc/cpuinfo 2>/dev/null; then + if grep -qE "CPU architecture:[[:space:]]*7" /proc/cpuinfo 2>/dev/null; then echo "armv7" - elif grep -qE "CPU architecture:\s*6" /proc/cpuinfo 2>/dev/null; then + elif grep -qE "CPU architecture:[[:space:]]*6" /proc/cpuinfo 2>/dev/null; then echo "armv6" else echo "armv5"