From f4734014ac5bee7fede76b83f7257b4bab57e59f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20K=C3=A4stner?= <benjamin.kaestner@gmail.com>
Date: Sat, 1 May 2021 12:39:36 +0200
Subject: [PATCH] Provide more operating system identification methods

While `/etc/os-release` is usually available on Linux systems, it
might be missing on distribution that don't follow that convention.

For those distributions, the commands `hostnamectl` (from systemd) and
`lsb_release` might provide an alternative. Unfortunately, those
commands might also be missing as well as `/etc/os-release`, so the
newly introduced `eshell-info-banner--get-os-information` function
falls back to the string "Unknown" (and should never fail).

Fixes #1.
---
 eshell-info-banner.el | 42 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/eshell-info-banner.el b/eshell-info-banner.el
index 8b2c7c8..5470289 100644
--- a/eshell-info-banner.el
+++ b/eshell-info-banner.el
@@ -292,20 +292,46 @@ the warning face with a battery level of 25% or less."
                                      (number-to-string percentage)
                                      :inherit (eshell-info-banner--get-color-percentage (- 100.0 percentage)))))))))
 
+                                        ; Operating system identification ;;;;;;;;;;;;;;;;;;
+(defun eshell-info-banner--get-os-information-from-release-file (&optional release-file)
+  "Read the operating system from the given RELEASE-FILE.
+
+If RELEASE-FILE is nil, use '/etc/os-release'."
+  (setq release-file (or release-file "/etc/os-release"))
+  (replace-regexp-in-string
+   ".*\"\\(.+\\)\""
+   "\\1"
+   (car (-filter (lambda (line)
+                   (s-contains? "PRETTY_NAME" line))
+                 (s-lines (with-temp-buffer
+                            (insert-file-contents release-file)
+                            (buffer-string)))))))
+
+(defun eshell-info-banner--get-os-information-from-hostnamectl ()
+  "Read the operating system via hostnamectl."
+  (with-temp-buffer
+    (call-process "hostnamectl" nil t nil)
+    (re-search-backward "Operating System: \\(.*\\)")
+    (match-string 1)))
+
+(defun eshell-info-banner--get-os-information-from-lsb-release ()
+  "Read the operating system information from lsb_release"
+  (shell-command-to-string "lsb_release -d -s"))
+
+(defun eshell-info-banner--get-os-information ()
+  "Get operating system identifying information."
+  (or (ignore-errors (eshell-info-banner--get-os-information-from-hostnamectl))
+      (ignore-errors (eshell-info-banner--get-os-information-from-lsb-release))
+      (ignore-errors (eshell-info-banner--get-os-information-from-release))
+      "Unkown"))
+
                                         ; Public functions ;;;;;;;;;;;;;;;;;;;;
 
 ;;;###autoload
 (defun eshell-info-banner ()
   "Banner for Eshell displaying system information."
   (let* ((partitions    (eshell-info-banner--get-mounted-partitions))
-         (os            (replace-regexp-in-string
-                         ".*\"\\(.+\\)\""
-                         "\\1"
-                         (car (-filter (lambda (line)
-                                         (s-contains? "PRETTY_NAME" line))
-                                       (s-lines (with-temp-buffer
-                                                  (insert-file-contents "/etc/os-release")
-                                                  (buffer-string)))))))
+         (os            (eshell-info-banner--get-os-information))
          (hostname      (system-name))
          (uptime        (s-chop-prefix "up "
                                        (s-trim (shell-command-to-string "uptime -p"))))