vrr/b4
2
0
Fork 0
mirror of https://github.com/DanielLavrushin/b4.git synced 2026-07-09 16:00:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: update regex for CPU architecture detection in install scripts Установка на keenetic (#265)
Some checks failed
Deploy documentation / build-and-deploy (push) Has been cancelled
Details

Browse source 
Fixes #260
This commit is contained in:
Daniel Lavrushin 2026-06-28 01:47:57 +02:00 • committed by GitHub
parent 417e49eb95
commit 3b75791581
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
install.sh
View file

@ -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"

6
installer/lib/utils.sh
View file

@ -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"