Skip to content

Update arm arch detection. #1230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update arm arch detection. #1230

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
717f469
Update arm arch detection.
wsobolewski Feb 2, 2025
0512ff0
Update arm architecture detection
wsobolewski Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions src/arch/arch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package arch

import (
//"regexp"
"encoding/hex"
"fmt"
"os"
//"os/exec"
"os/exec"
"strings"
//"fmt"
"encoding/hex"
)

func SearchBytesInFile( path string, match string, limit int) bool {
Expand Down Expand Up @@ -61,14 +61,35 @@ func Bit(path string) string {
}

func Validate(str string) (string){
osArch, err := GetOSArchitecture()
if err != nil {
fmt.Println("Failed to get OS architecture:", err)
}
if str == "" {
str = strings.ToLower(os.Getenv("PROCESSOR_ARCHITECTURE"))
}
if strings.Contains(str, "arm64") {
if strings.Contains(str, "arm64") || strings.Contains(strings.ToLower(osArch), "arm") {
return "arm64"
}
if strings.Contains(str, "64") {
return "64"
}
return "32"
}

func GetOSArchitecture() (string, error) {
cmd := exec.Command("wmic", "os", "get", "osarchitecture")
output, err := cmd.Output()
if err != nil {
return "", err
}
lines := strings.Split(string(output), "\n")
for _, line := range lines {
line = strings.TrimSpace(line)
if line == "" || strings.Contains(line, "OSArchitecture") {
continue
}
return line, nil
}
return "", fmt.Errorf("failed to find OS architecture")
}