From 98b8f01de35d9138d47b4557dc896c72eff82e9e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 19 Aug 2022 11:11:33 +0200 Subject: [PATCH] fix(lib): vestigial call to missing cat function This was brought over from `doom-info` in f33d8e7, but one of the lexical function calls wasn't refactored out. Ref: https://github.com/doomemacs/doomemacs/blob/a5c80fcb4b487b929681f1cb4fd64e5b5a2ae473/lisp/lib/debug.el#L216-L219 Fix: #6698 Amend: c5e3f4d632c1 Co-authored-by: ivanbrennan --- lisp/lib/system.el | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/lisp/lib/system.el b/lisp/lib/system.el index 6aad3a5b1..e7961103a 100644 --- a/lisp/lib/system.el +++ b/lisp/lib/system.el @@ -10,7 +10,8 @@ (IS-MAC 'macos) ((and (file-exists-p "/etc/os-release") (with-temp-buffer - (insert-file-contents "/etc/os-release") + (let ((coding-system-for-read 'utf-8-auto)) + (insert-file-contents "/etc/os-release")) (when (re-search-forward "^ID=\"?\\([^\"\n]+\\)\"?" nil t) (intern (downcase (match-string 1))))))) ;; A few redundancies in case os-release fails us @@ -28,7 +29,8 @@ (defun doom-system-distro-version () "Return a distro name and version string." (letf! (defun sh (&rest args) (cdr (apply #'doom-call-process args))) - (let ((distro (doom-system-distro))) + (let ((distro (doom-system-distro)) + (coding-system-for-read 'utf-8-auto)) (cond ((eq distro 'windows) (format "Windows %s" "Unknown")) ; TODO @@ -40,12 +42,17 @@ (format "NixOS %s" (sh "nixos-version"))) ((and (file-exists-p "/etc/os-release") (with-temp-buffer - (insert-file-contents "/etc/os-release") - (when (re-search-forward "^PRETTY_NAME=\"?\\([^\"\n]+\\)\"?" nil t) - (match-string 1))))) + (insert-file-contents "/etc/os-release") + (when (re-search-forward "^PRETTY_NAME=\"?\\([^\"\n]+\\)\"?" nil t) + (match-string 1))))) ((when-let (files (doom-glob "/etc/*-release")) (truncate-string-to-width - (replace-regexp-in-string "\n" " " (cat (car files) 73) nil t) + (replace-regexp-in-string + "\n" " " + (with-temp-buffer + (insert-file-contents (car files) nil nil 73) + (buffer-string)) + nil t) 64 nil nil "..."))) ((concat "Unknown " (sh "uname" "-v")))))))