Skip to content

Commit 10343d3

Browse files
authored
Merge pull request #96 from infosiftr/rpm-host-arch
Add RPM support to `bashbrew-host-arch.sh` (via querying RPM's own architecture)
2 parents 12c7580 + 6c47dbb commit 10343d3

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

scripts/bashbrew-host-arch.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ if command -v apk > /dev/null && tryArch="$(apk --print-arch)"; then
1111
arch="$tryArch"
1212
elif command -v dpkg > /dev/null && tryArch="$(dpkg --print-architecture)"; then
1313
arch="${tryArch##*-}"
14+
elif command -v rpm > /dev/null && tryArch="$(rpm --query --queryformat='%{ARCH}' rpm)"; then
15+
arch="$tryArch"
1416
elif command -v uname > /dev/null && tryArch="$(uname -m)"; then
1517
echo >&2 "warning: neither of 'dpkg' or 'apk' found, falling back to 'uname'"
1618
arch="$tryArch"
@@ -28,7 +30,8 @@ case "$arch" in
2830
amd64 | x86_64) found 'amd64' ;;
2931
arm64 | aarch64) found 'arm64v8' ;;
3032
armel) found 'arm32v5' ;;
31-
armv7) found 'arm32v7' ;;
33+
armv6*) found 'arm32v6' ;;
34+
armv7*) found 'arm32v7' ;;
3235
i[3456]86 | x86) found 'i386' ;;
3336
mips64el) found 'mips64le' ;; # TODO "uname -m" is just "mips64" (which is also "apk --print-arch" on big-endian MIPS) so we ought to disambiguate that somehow
3437
ppc64el | ppc64le) found 'ppc64le' ;;

0 commit comments

Comments
 (0)