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

Manage one more case of -p' not accepted as uptime' switch

Browse Source
This commit is contained in:
Lucien Cartier-Tilet 2021-05-22 04:06:01 +02:00
parent 0f39c31884
commit 2a6f8bea29
Signed by: phundrak
GPG Key ID: BD7789E705CB8DCA
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eshell-info-banner.el
View File

@ -170,14 +170,16 @@
If the executable `uptime' is not found, return nil." If the executable `uptime' is not found, return nil."
(when (executable-find "uptime") (when (executable-find "uptime")
(let ((uptime-str (shell-command-to-string "uptime -p"))) (let ((uptime-str (shell-command-to-string "uptime -p")))
(if (not (string-match-p "invalid" uptime-str)) (if (not (seq-some (lambda (keyword)
(string-match-p keyword uptime-str))
'("invalid" "illegal")))
(s-chop-prefix "up " (s-trim uptime-str)) (s-chop-prefix "up " (s-trim uptime-str))
(let ((uptime-str (shell-command-to-string "uptime"))) (let ((uptime-str (shell-command-to-string "uptime")))
(save-match-data (save-match-data
(string-match " *[0-9:]+ *up *\\([0-9:]+\\)," uptime-str) (string-match "[^,]+up *\\([^,]+\\)," uptime-str)
(substring-no-properties uptime-str (s-trim (substring-no-properties uptime-str
(match-beginning 1) (match-beginning 1)
(match-end 1)))))))) (match-end 1)))))))))
(eshell-info-banner--get-uptime) (eshell-info-banner--get-uptime)