phundrak/eshell-info-banner.el
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Add partial support for Mac, Guix, improve Windows OS detection

Browse Source 
This commit adds detection of the current OSX or macOS version.

It also adds support for non-standard Guix SD Linux distribution.

Windows OS detection is improved, with a separation of the name of the
version of Windows and its build number, the latter is treated as the
kernel version of Windows.
This commit is contained in:
Lucien Cartier-Tilet 2021-05-22 03:59:08 +02:00
parent f5b5ebccc7
commit 0f39c31884
Signed by: phundrak
GPG Key ID: BD7789E705CB8DCA
1 changed files with 76 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
eshell-info-banner.el
View File

@ -60,6 +60,22 @@
(defconst eshell-info-banner--min-length-left 8 (defconst eshell-info-banner--min-length-left 8
"Minimum length of text on the left hand side of the banner.") "Minimum length of text on the left hand side of the banner.")
(defconst eshell-info-banner--macos-versions
'(("10.4" . "Mac OS X Tiger")
("10.5" . "Mac OS X Leopard")
("10.6" . "Mac OS X Snow Leopard")
("10.7" . "Mac OS X Lion")
("10.8" . "OS X Mountain Lion")
("10.9" . "OS X Mavericks")
("10.10" . "OS X Yosemite")
("10.11" . "OS X El Capitan")
("10.12" . "macOS Sierra")
("10.13" . "macOS High Sierra")
("10.14" . "macOS Mojave")
("10.15" . "macOS Catalina")
("10.16" . "macOS Big Sur")
("11.0" . "macOS Big Sur"))
"Versions of OSX and macOS and their name.")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -512,41 +528,68 @@ If RELEASE-FILE is nil, use '/etc/os-release'."
((string= "BuildLab" (match-string 1)) (setq win32-build (match-string 3))))) ((string= "BuildLab" (match-string 1)) (setq win32-build (match-string 3)))))
(format "%s (%s)" win32-name win32-build)))) (format "%s (%s)" win32-name win32-build))))
(defun eshell-info-banner--get-os-information () (defun eshell-info-banner--get-os-information/windows ()
"Get operating system identifying information." "See `eshell-info-banner--get-os-information'."
(let ((prefix (if eshell-info-banner-tramp-aware (file-remote-p default-directory) ""))) (let ((os (eshell-info-banner--get-os-information-from-registry)))
(save-match-data
(string-match "\\([^()]+\\) *(\\([^()]+\\))" os)
`(,(s-trim (substring-no-properties os
(match-beginning 1)
(match-end 1)))
.
,(substring-no-properties os
(match-beginning 2)
(match-end 2))))))
(pcase system-type (defun eshell-info-banner--get-os-information/gnu ()
((or 'ms-dos 'windows-nt 'cygwin) "See `eshell-info-banner--get-os-information'."
(let ((os (eshell-info-banner--get-os-information-from-registry))) (let ((prefix (if eshell-info-banner-tramp-aware (file-remote-p default-directory) "")))
`(,(cond
((executable-find "hostnamectl" eshell-info-banner-tramp-aware)
(eshell-info-banner--get-os-information-from-hostnamectl))
((executable-find "lsb_release" eshell-info-banner-tramp-aware)
(eshell-info-banner--get-os-information-from-lsb-release))
((file-exists-p (concat prefix "/etc/os-release"))
(eshell-info-banner--get-os-information-from-release-file))
((executable-find "shepherd")
(let ((distro (car (s-lines (shell-command-to-string "guix -V")))))
(save-match-data (save-match-data
(string-match "\\([^()]+\\) *(\\([^()]+\\))" os) (string-match "\\([0-9\\.]+\\)" distro)
`(,(s-trim (substring-no-properties os (concat "Guix System "
(match-beginning 1) (substring-no-properties distro
(match-end 1))) (match-beginning 1)
. (match-end 1))))))
,(substring-no-properties os (t "Unknown"))
(match-beginning 2) .
(match-end 2)))))) ,(s-trim (shell-command-to-string "uname -rs")))))
((or 'gnu 'gnu/linux 'gnu/kfreebsd 'darwin)
`(,(cond (defmacro eshell-info-banner--get-macos-name (version)
((executable-find "hostnamectl" eshell-info-banner-tramp-aware) "Get the name of the current macOS or OSX system based on its VERSION."
(eshell-info-banner--get-os-information-from-hostnamectl)) `(cond
((executable-find "lsb_release" eshell-info-banner-tramp-aware) ,@(mapcar (lambda (major)
(eshell-info-banner--get-os-information-from-lsb-release)) `((string-match-p (regexp-quote ,(car major))
((file-exists-p (concat prefix "/etc/os-release")) ,version)
(eshell-info-banner--get-os-information-from-release-file)) ,(cdr major)))
((executable-find "shepherd") eshell-info-banner--macos-versions)))
(let ((distro (car (s-lines (shell-command-to-string "guix -V")))))
(save-match-data (defun eshell-info-banner--get-os-information/darwin ()
(string-match "\\([0-9\\.]+\\)" distro) "See `eshell-info-banner--get-os-information'."
(concat "Guix System " `(,(eshell-info-banner--get-macos-name (s-trim (shell-command-to-string "sw_vers -productVersion")))
(substring-no-properties distro .
(match-beginning 1) ,(s-trim (shell-command-to-string "uname -rs"))))
(match-end 1))))))
(t "Unknown")) (defun eshell-info-banner--get-os-information ()
. "Get operating system identifying information.
,(s-trim (shell-command-to-string "uname -rs"))))))) Return a pair containing first the name of the operating system
and second its kernel name and version (or in Windows’ case its
build number)."
(pcase system-type
((or 'ms-dos 'windows-nt 'cygwin)
(eshell-info-banner--get-os-information/windows))
((or 'gnu 'gnu/linux 'gnu/kfreebsd)
(eshell-info-banner--get-os-information/gnu))
('darwin
(eshell-info-banner--get-os-information/darwin))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;