From c340e02fcde5ba49d76298bb3b2b59f29c8b80d2 Mon Sep 17 00:00:00 2001 From: CapCreeperGR Date: Mon, 6 May 2024 11:26:48 +0300 Subject: [PATCH] Distro information will no longer need to be hard coded if ID, NAME and PRETTY_NAME are values in /etc/os-release --- main.go | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/main.go b/main.go index 46362fb..24d4c9a 100644 --- a/main.go +++ b/main.go @@ -138,25 +138,18 @@ func getDistroInfo() DistroInfo { } switch distroID { - case "debian": - return DistroInfo{ - ID: "debian", - LongName: releaseMap["PRETTY_NAME"], - ShortName: releaseMap["NAME"], - } - case "ubuntu": - return DistroInfo{ - ID: "ubuntu", - LongName: releaseMap["PRETTY_NAME"], - ShortName: releaseMap["NAME"], - } - case "arch": - return DistroInfo{ - ID: "arch", - LongName: releaseMap["PRETTY_NAME"], - ShortName: releaseMap["NAME"], - } default: + if id, ok := releaseMap["ID"]; ok { + if longName, ok := releaseMap["PRETTY_NAME"]; ok { + if shortName, ok := releaseMap["NAME"]; ok { + return DistroInfo{ + ID: id, + LongName: longName, + ShortName: shortName, + } + } + } + } return DistroInfo{ ID: "unknown", LongName: "Unknown",