emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix parsing issue in doom-system-distro{,-version}

Browse source 
No guarantee the values in /etc/os-release are quoted.

Also, eliminate the code paths where these functions return nil.
This commit is contained in:
Henrik Lissner 2021-03-02 11:59:09 -05:00
parent 91bf57b762
commit 8ccba925dd
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/autoload/system.el
View file

@ -5,11 +5,11 @@
"Return a symbol representing the installed distro."
(cond (IS-WINDOWS 'windows)
(IS-MAC 'macos)
((file-exists-p "/etc/os-release")
(with-temp-buffer
(insert-file-contents "/etc/os-release")
(when (re-search-forward "^ID=\\([^\"$]+\\)" nil t)
(intern (downcase (match-string 1))))))
((and (file-exists-p "/etc/os-release")
(with-temp-buffer
(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
((file-exists-p "/etc/debian_version")
'debian)
@ -35,11 +35,11 @@
(sh "lsb_release" "-s" "-d"))
((executable-find "nixos-version")
(format "NixOS %s" (sh "nixos-version")))
((file-exists-p "/etc/os-release")
(with-temp-buffer
(insert-file-contents "/etc/os-release")
(when (re-search-forward "^PRETTY_NAME=\"\\([^\"]+\\)\"" nil t)
(intern (downcase (match-string 1))))))
((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)))))
((when-let (files (doom-glob "/etc/*-release"))
(truncate-string-to-width
(replace-regexp-in-string "\n" " " (cat (car files) 73) nil t)