Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
36b964a993
|
|||
|
661ae7c87d
|
|||
|
382bb55064
|
@@ -22,6 +22,7 @@ macOS. PR are welcome if you want to fix that!
|
||||
* Table of Contents :TOC_2_gh:
|
||||
- [[#introduction][Introduction]]
|
||||
- [[#recent-breaking-changes][Recent Breaking Changes]]
|
||||
- [[#081][~0.8.1~]]
|
||||
- [[#070][~0.7.0~]]
|
||||
- [[#installation][Installation]]
|
||||
- [[#customizing][Customizing]]
|
||||
@@ -33,6 +34,11 @@ macOS. PR are welcome if you want to fix that!
|
||||
- [[#license][License]]
|
||||
|
||||
* Recent Breaking Changes
|
||||
** ~0.8.1~
|
||||
Version ~0.8.1~ removes the optional argument ~REMOTE~ from
|
||||
~eshell-info-banner--executable-find~. It now only acts according to the
|
||||
user’s preference set with ~eshell-info-banner-tramp-aware~.
|
||||
|
||||
** ~0.7.0~
|
||||
Version ~0.7.0~ renames several functions to conform with the Elisp
|
||||
Coding Conventions.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
;; Author: Lucien Cartier-Tilet <lucien@phundrak.com>
|
||||
;; Maintainer: Lucien Cartier-Tilet <lucien@phundrak.com>
|
||||
;; Version: 0.8.0
|
||||
;; Version: 0.8.1
|
||||
;; Package-Requires: ((emacs "25.1") (f "0.20") (s "1"))
|
||||
;; Homepage: https://github.com/Phundrak/eshell-info-banner.el
|
||||
|
||||
@@ -87,6 +87,9 @@
|
||||
("11.6" . "macOS Big Sur"))
|
||||
"Versions of OSX and macOS and their name."))
|
||||
|
||||
(defconst eshell-info-banner--posix-shells '("bash" "zsh" "sh")
|
||||
"List of POSIX-compliant shells to run external commands through.")
|
||||
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
; Custom variables ;
|
||||
@@ -140,18 +143,18 @@
|
||||
:type 'list
|
||||
:version "0.3.0")
|
||||
|
||||
(defun eshell-info-banner--executable-find (program &optional remote)
|
||||
"Find PROGRAM executable, possibly on a REMOTE machine.
|
||||
(defun eshell-info-banner--executable-find (program)
|
||||
"Find PROGRAM executable, possibly on a remote machine.
|
||||
This is a wrapper around `executable-find' in order to avoid
|
||||
issues with older versions of the functions only accepting one
|
||||
argument."
|
||||
argument. `executable-find'’s remote argument has the value of
|
||||
`eshell-info-banner-tramp-aware'."
|
||||
(if (version< emacs-version "27.1")
|
||||
(let ((default-directory (if (and eshell-info-banner-tramp-aware
|
||||
remote)
|
||||
(let ((default-directory (if eshell-info-banner-tramp-aware
|
||||
default-directory
|
||||
"~")))
|
||||
(executable-find program))
|
||||
(executable-find program remote)))
|
||||
(executable-find program eshell-info-banner-tramp-aware)))
|
||||
|
||||
(defcustom eshell-info-banner-duf-executable "duf"
|
||||
"Path to the `duf' executable."
|
||||
@@ -215,7 +218,13 @@ argument."
|
||||
(defun eshell-info-banner--shell-command-to-string (command)
|
||||
"Execute shell command COMMAND and return its output as a string.
|
||||
Ensures the command is ran with LANG=C."
|
||||
(shell-command-to-string (format "LANG=C %s" command)))
|
||||
(let ((shell (or (seq-find (lambda (shell)
|
||||
(eshell-info-banner--executable-find shell))
|
||||
eshell-info-banner--posix-shells)
|
||||
"sh")))
|
||||
(with-temp-buffer
|
||||
(call-process shell nil t nil "-c" (concat "LANG=C " command))
|
||||
(buffer-string))))
|
||||
|
||||
(defun eshell-info-banner--progress-bar-without-prefix (bar-length used total &optional newline)
|
||||
"Display a progress bar without its prefix.
|
||||
@@ -457,13 +466,32 @@ Compatible with Darwin and FreeBSD at least."
|
||||
(let* ((command-to-mem (lambda (command)
|
||||
(string-to-number
|
||||
(s-trim
|
||||
(cadr
|
||||
(split-string (eshell-info-banner--shell-command-to-string command)
|
||||
" "
|
||||
t)))))))
|
||||
`(("RAM"
|
||||
,(apply command-to-mem '("sysctl hw.physmem"))
|
||||
,(apply command-to-mem '("sysctl hw.usermem"))))))
|
||||
(car (last
|
||||
(split-string (eshell-info-banner--shell-command-to-string command)
|
||||
" "
|
||||
t)))))))
|
||||
(netbsdp (and (equal system-type 'berkeley-unix)
|
||||
(string-match-p "NetBSD" (eshell-info-banner--shell-command-to-string "uname"))))
|
||||
(total (apply command-to-mem `(,(if netbsdp "sysctl hw.physmem64" "sysctl hw.physmem"))))
|
||||
(used (if netbsdp
|
||||
(- total
|
||||
(* 1024 (string-to-number
|
||||
(s-trim
|
||||
(with-temp-buffer
|
||||
(insert-file-contents-literally "/proc/meminfo")
|
||||
(save-match-data
|
||||
(string-match (rx bol
|
||||
"MemFree:"
|
||||
(* blank)
|
||||
(group (+ digit))
|
||||
(* blank)
|
||||
"kB")
|
||||
(buffer-string))
|
||||
(substring-no-properties (buffer-string)
|
||||
(match-beginning 1)
|
||||
(match-end 1))))))))
|
||||
(apply command-to-mem '("sysctl hw.usermem")))))
|
||||
`(("RAM" ,total ,used))))
|
||||
|
||||
(defun eshell-info-banner--get-memory-windows ()
|
||||
"Get memory usage for Window."
|
||||
@@ -662,7 +690,7 @@ If RELEASE-FILE is nil, use '/etc/os-release'."
|
||||
(insert-file-contents (concat prefix "/bedrock/etc/bedrock-release"))
|
||||
(buffer-string))))
|
||||
;; Proxmox
|
||||
((eshell-info-banner--executable-find "pveversion" eshell-info-banner-tramp-aware)
|
||||
((eshell-info-banner--executable-find "pveversion")
|
||||
(let ((distro (eshell-info-banner--shell-command-to-string "pveversion")))
|
||||
(save-match-data
|
||||
(string-match "/\\([^/]+\\)/" distro)
|
||||
@@ -670,9 +698,9 @@ If RELEASE-FILE is nil, use '/etc/os-release'."
|
||||
(substring-no-properties distro
|
||||
(match-beginning 1)
|
||||
(match-end 1))))))
|
||||
((eshell-info-banner--executable-find "hostnamectl" eshell-info-banner-tramp-aware)
|
||||
((eshell-info-banner--executable-find "hostnamectl")
|
||||
(eshell-info-banner--get-os-information-from-hostnamectl))
|
||||
((eshell-info-banner--executable-find "lsb_release" eshell-info-banner-tramp-aware)
|
||||
((eshell-info-banner--executable-find "lsb_release")
|
||||
(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))
|
||||
|
||||
Reference in New Issue
Block a user