From ac777211fdd1a5556097a9856389dc34f5356706 Mon Sep 17 00:00:00 2001
From: Patrick Spek <p.spek@tyil.nl>
Date: Wed, 1 Apr 2020 11:30:24 +0200
Subject: Update sysinfo to only use POSIX specified uname info

---
 etc/bindeps.d/gnu_linux-ubuntu.txt |  2 --
 etc/bindeps.d/linux-ubuntu.txt     |  2 ++
 etc/pacmans.txt                    |  2 +-
 etc/perlmans.txt                   |  2 +-
 lib/main.bash                      | 18 +++++++++---------
 5 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 etc/bindeps.d/gnu_linux-ubuntu.txt
 create mode 100644 etc/bindeps.d/linux-ubuntu.txt

diff --git a/etc/bindeps.d/gnu_linux-ubuntu.txt b/etc/bindeps.d/gnu_linux-ubuntu.txt
deleted file mode 100644
index 6d60a0e..0000000
--- a/etc/bindeps.d/gnu_linux-ubuntu.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-gcc=gcc
-make=make
diff --git a/etc/bindeps.d/linux-ubuntu.txt b/etc/bindeps.d/linux-ubuntu.txt
new file mode 100644
index 0000000..6d60a0e
--- /dev/null
+++ b/etc/bindeps.d/linux-ubuntu.txt
@@ -0,0 +1,2 @@
+gcc=gcc
+make=make
diff --git a/etc/pacmans.txt b/etc/pacmans.txt
index 660ae51..7657f7f 100644
--- a/etc/pacmans.txt
+++ b/etc/pacmans.txt
@@ -1,2 +1,2 @@
-gnu_linux-ubuntu=apt update && apt install -y
+linux-ubuntu=apt update && apt install -y
 freebsd=pkg update && pkg install -y
diff --git a/etc/perlmans.txt b/etc/perlmans.txt
index 9ffbacc..1ea6f65 100644
--- a/etc/perlmans.txt
+++ b/etc/perlmans.txt
@@ -1 +1 @@
-gnu_linux-ubuntu=apt install -y cpanminus && cpanm -v
+linux-ubuntu=apt install -y cpanminus && cpanm -v
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