From b177d4f6f657e7713548c63f8b1a3b553ecfd7b9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Dec 2016 07:49:27 +1100 Subject: [PATCH] Distro: Add back lsb_release detection --- neofetch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/neofetch b/neofetch index d95e5fd1..407b8f13 100755 --- a/neofetch +++ b/neofetch @@ -90,6 +90,19 @@ get_distro() { "off") distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; esac + # If the os-release file identifies the system as "Ubuntu" + # we then use lsb_release to get the distro information. + # This is required since Linux Mint and other distros + # aren't using the os-release file correctly. + if [[ "$distro" =~ "Ubuntu" ]]; then + case "$distro_shorthand" in + "on") lsb_flags="-sir" ;; + "tiny") lsb_flags="-si" ;; + "on") lsb_flags="-sd" ;; + esac + distro="$(lsb_release $lsb_flags)" + fi + # Workarounds for distros that go against the os-release standard. [[ -z "${distro// }" ]] && distro="$(awk '/BLAG/ {print $1; exit}' /etc/*ease /usr/lib/*ease)" [[ -z "${distro// }" ]] && distro="$(awk -F'=' '{print $2; exit}' /etc/*ease /usr/lib/*ease)"