From ac777211fdd1a5556097a9856389dc34f5356706 Mon Sep 17 00:00:00 2001
From: Patrick Spek
Date: Wed, 1 Apr 2020 11:30:24 +0200
Subject: Update sysinfo to only use POSIX specified uname info
---
lib/main.bash | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
(limited to 'lib')
diff --git a/lib/main.bash b/lib/main.bash
index a06c003..a5aaa6c 100644
--- a/lib/main.bash
+++ b/lib/main.bash
@@ -200,17 +200,21 @@ depcheck_perl() {
# sysinfo command in their message to you.
discover_system() {
RSTAR_PLATFORM["os"]="$(discover_system_os)"
+ RSTAR_PLATFORM["arch"]="$(discover_system_arch)"
+ RSTAR_PLATFORM["version"]="$(discover_system_version)"
- if [[ ${RSTAR_PLATFORM[os]} == "gnu_linux" ]]
+ if [[ ${RSTAR_PLATFORM[os]} == "linux" ]]
then
RSTAR_PLATFORM["distro"]="$(discover_system_distro)"
- RSTAR_PLATFORM["kernel"]="$(discover_system_kernel)"
- RSTAR_PLATFORM["kernel_version"]="$(discover_system_kernel_version)"
fi
RSTAR_PLATFORM[key]="$(discover_system_key)"
}
+discover_system_arch() {
+ uname -m
+}
+
discover_system_distro() {
if [[ -f /etc/os-release ]]
then
@@ -221,11 +225,7 @@ discover_system_distro() {
awk -F= '$1 == "NAME" {print tolower($2);q}' /etc/*release
}
-discover_system_kernel() {
- printf "%s" "$(uname -s | awk '{print tolower($0)}')"
-}
-
-discover_system_kernel_version() {
+discover_system_version() {
printf "%s" "$(uname -r | awk '{print tolower($0)}')"
}
@@ -243,7 +243,7 @@ discover_system_key() {
discover_system_os() {
if command -v uname > /dev/null
then
- printf "%s" "$(uname -o | awk '{print tolower($0)}' | sed 's_[/+]_\__g')"
+ printf "%s" "$(uname -s | awk '{print tolower($0)}' | sed 's_[/+]_\__g')"
return
fi
}
--
cgit v1.1