2 Commits
0.7.0 ... 0.7.1

Author SHA1 Message Date
60daf22d32 Remove dash.el dependency 2021-11-10 19:52:15 +01:00
Shohei YOSHIDA
32a65e4a6a Fix typo 2021-11-10 16:43:11 +09:00

View File

@@ -2,8 +2,8 @@
;; Author: Lucien Cartier-Tilet <lucien@phundrak.com>
;; Maintainer: Lucien Cartier-Tilet <lucien@phundrak.com>
;; Version: 0.7.0
;; Package-Requires: ((emacs "25.1") (dash "2") (f "0.20") (s "1"))
;; Version: 0.7.1
;; Package-Requires: ((emacs "25.1") (f "0.20") (s "1"))
;; Homepage: https://labs.phundrak.com/phundrak/eshell-info-banner.el
;; This file is not part of GNU Emacs
@@ -24,7 +24,7 @@
;;; Commentary:
;; `eshell-info-banner' is a utility for cerating an informative
;; `eshell-info-banner' is a utility for creating an informative
;; banner akin to fish_greeting if fish shell but for Eshell. It can
;; provide information on:
;; - the OS name
@@ -38,10 +38,10 @@
;;; Code:
(require 'cl-lib)
(require 'dash)
(require 'f)
(require 'em-banner)
(require 'json)
(require 'seq)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -228,11 +228,10 @@ If the executable `uptime' is not found, return nil."
The returned value is in any case greater than
`eshell-info-banner--min-length-left'."
(-reduce-from (lambda (len partition)
(max len
(length (eshell-info-banner--mounted-partitions-path partition))))
eshell-info-banner--min-length-left
partitions))
(let ((length eshell-info-banner--min-length-left))
(dolist (partition partitions length)
(setf length (max length
(length (eshell-info-banner--mounted-partitions-path partition)))))))
(defun eshell-info-banner--abbr-path (path &optional abbr)
"Remove `$HOME' from `PATH', abbreviate parent dirs if `ABBR' non nil.
@@ -298,19 +297,21 @@ chosen. Relies on the `duf' command."
"Get mounted partitions through df.
Common function between
`eshell-info-banner--get-mounted-partitions-gnu' and
`eshell-info-banner--get-mounted-partitions-darwing' which would
`eshell-info-banner--get-mounted-partitions-darwin' which would
otherwise differ solely on the position of the mount point in the
partition list. Its position is given by the argument
MOUNT-POSITION."
(let ((partitions (split-string (eshell-info-banner--shell-command-to-string "df -lH") (regexp-quote "\n") t)))
(-keep (lambda (partition)
(let ((partitions (split-string (eshell-info-banner--shell-command-to-string "df -lH")
(regexp-quote "\n")
t)))
(seq-filter (lambda (partition)
(let* ((partition (split-string partition " " t))
(filesystem (nth 0 partition))
(size (nth 1 partition))
(used (nth 2 partition))
(percent (nth 4 partition))
(mount (nth mount-position partition)))
(when (seq-some (lambda (prefix)
(unless (seq-some (lambda (prefix)
(string-prefix-p prefix filesystem t))
eshell-info-banner-partition-prefixes)
(make-eshell-info-banner--mounted-partitions
@@ -401,7 +402,7 @@ For TEXT-PADDING and BAR-LENGTH, see the documentation of
; Memory ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun eshell-info-banner--get-memory-gnu ()
"Get memory usage for GNU/Linux and Hurd."
(-map (lambda (line)
(seq-do (lambda (line)
(let* ((line (split-string line " " t)))
(list (s-chop-suffix ":" (nth 0 line)) ; name
(string-to-number (nth 1 line)) ; total
@@ -654,7 +655,7 @@ If RELEASE-FILE is nil, use '/etc/os-release'."
,version)
,(cdr major)))
eshell-info-banner--macos-versions)
(t "unkown version")))
(t "unknown version")))
(defun eshell-info-banner--get-os-information-darwin ()
"See `eshell-info-banner--get-os-information'."